| | |
| | | import com.thhy.general.common.BasicResult; |
| | | import com.thhy.general.config.SysUserInfo; |
| | | import com.thhy.general.utils.UserInfoUtils; |
| | | import com.thhy.materials.modules.biz.concret.entity.TMaterialRelease; |
| | | import com.thhy.materials.modules.biz.concret.entity.TReleaseData; |
| | | import com.thhy.materials.modules.biz.concret.entity.*; |
| | | import com.thhy.materials.modules.biz.concret.entity.dto.DicetName; |
| | | import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto; |
| | | import com.thhy.materials.modules.biz.concret.mapper.TMaterialReleaseMappper; |
| | | import com.thhy.materials.modules.biz.concret.service.TMaterialReleaseService; |
| | | import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper; |
| | |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | @Override |
| | | public BasicResult materialRew(HashMap<String, Object> values) { |
| | | Integer pageSize = Integer.valueOf(values.get("pageSize").toString()); |
| | | Integer pageNum = Integer.valueOf(values.get("pageNum").toString()); |
| | | PageHelper.startPage(pageNum,pageSize); |
| | | List<PieceDto> pieceDtos = materialReleaseMappper.pieceList(values); |
| | | for (PieceDto pieceDto : pieceDtos){ |
| | | List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById()); |
| | | pieceDto.setRawMaterials(rawMaterials); |
| | | } |
| | | PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos); |
| | | return BasicResult.success(pieceDtoPageInfo); |
| | | } |
| | | |
| | | @Override |
| | | public BasicResult mixingInsert(HashMap<String, Object> values) { |
| | | values.put("mixingId",""); |
| | | materialReleaseMappper.mixingInsert(values); |
| | | return BasicResult.success(); |
| | | } |
| | | |
| | | @Override |
| | | public BasicResult mixingList(HashMap<String, Object> values) { |
| | | // Integer pageSize = Integer.valueOf(values.get("pageSize").toString()); |
| | | // Integer pageNum = Integer.valueOf(values.get("pageNum").toString()); |
| | | // PageHelper.startPage(pageNum,pageSize); |
| | | List<TMixing> mixings = materialReleaseMappper.mixingList(values); |
| | | //PageInfo<TMixing> tMixingPageInfo = new PageInfo<>(mixings); |
| | | return BasicResult.success(mixings); |
| | | } |
| | | |
| | | @Override |
| | | public BasicResult siloList(Integer types) { |
| | | List<TSilo> tSilos = materialReleaseMappper.siloList(types); |
| | | for (TSilo silo :tSilos){ |
| | | TMixing mixings = materialReleaseMappper.mixingLists(silo.getSiloId()); |
| | | silo.setMixing(mixings); |
| | | } |
| | | return BasicResult.success(tSilos); |
| | | } |
| | | } |