| | |
|---|
| | | pipeInfo.setOutMod(PipeOutModType.IN.getValue()); //入模 |
|---|
| | | pipeInfo.setPipeNum(UUIDUtils.createPipeNum(proNumber,countPipeInPro)); |
|---|
| | | //pipeInfo.setRingNum(); |
|---|
| | | RingCompleteCheck completeCheck = pipeInfoMapper.queryRingComplete(pipeInfo); |
|---|
| | | RingCompleteCheck completeCheck = pipeInfoMapper.queryRingCompleteByMod(mould.getMouldNum(),pipeInfo.getProId()); |
|---|
| | | if(completeCheck==null){ |
|---|
| | | int maxRingNum = pipeInfoMapper.queryMaxRingNum(userInfo.getCompanyId()); |
|---|
| | | pipeInfo.setRingNum(UUIDUtils.createRingNum(maxRingNum)); |
|---|
| | |
|---|
| | | throw new BasicException(BasicStatus.RING_NUM_IS_REPEAT); |
|---|
| | | } |
|---|
| | | |
|---|
| | | List<Mould> mouldList = pipeInfoMapper.queryMouldTypeByPro(proId); |
|---|
| | | List<Mould> mouldList = pipeInfoMapper.queryMouldByNumType(proId,modCheckDto.getNumType()); |
|---|
| | | /*mouldList.forEach(ml->{ |
|---|
| | | ml = mouldMapper.queryById(ml.getMouldId()); |
|---|
| | | });*/ |
|---|
| | |
|---|
| | | steelProduce.setReinforcementId("02d336f47ea0eff7ec70c64f"); //配筋写死值 |
|---|
| | | |
|---|
| | | for(Mould m : mouldList){ |
|---|
| | | m = mouldMapper.queryById(m.getMouldId()); |
|---|
| | | //m = mouldMapper.queryById(m.getMouldId()); |
|---|
| | | String proNumber = steelProduceMapper.queryProNumByProject(proId); |
|---|
| | | int maxSteelNum = pipeInfoMapper.queryMaxNumBySteelProduce(); |
|---|
| | | steelProduce.setProduceNumber(UUIDUtils.createSteelNum(proNumber,maxSteelNum)); |
|---|
| | |
|---|
| | | }*/ |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<MouldCheckListVo> findModCheckList(ModCheckDto modCheckDto) { |
|---|
| | | SysUserInfo userInfo = UserInfoUtils.getInstance().getUserInfo(); |
|---|
| | |
|---|
| | | return mouldMapper.getH5MouldInfo(mouldId); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<Integer> allNumType() { |
|---|
| | | return pipeInfoMapper.queryAllNumType(); |
|---|
| | | } |
|---|
| | | } |
|---|
