~zhangleilei/supipe.git

			@@ -159,12 +159,12 @@
			pipeInfo.setOutMod(PipeOutModType.IN.getValue()); //入模
			pipeInfo.setPipeNum(UUIDUtils.createPipeNum(proNumber,countPipeInPro));
			//pipeInfo.setRingNum();
			RingCompleteCheck completeCheck = pipeInfoMapper.queryRingComplete(pipeInfo);
			if(completeCheck==null){
			List<RingCompleteCheck> completeCheckList = pipeInfoMapper.queryRingCompleteByMod(mould.getMouldNum(),pipeInfo.getProId());
			if(completeCheckList.isEmpty()){
			int maxRingNum = pipeInfoMapper.queryMaxRingNum(userInfo.getCompanyId());
			pipeInfo.setRingNum(UUIDUtils.createRingNum(maxRingNum));
			}else {
			pipeInfo.setRingNum(completeCheck.getRingnum());
			pipeInfo.setRingNum(completeCheckList.get(0).getRingnum());
			}
			pipeInfoMapper.insert(pipeInfo);
			pipeInfoMapper.updateSysMouldFree(new MouldFree(pipeInfo.getModId(), MouldFreeType.AL_USE.getValue()));
			@@ -219,7 +219,7 @@
			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());
			});*/
			@@ -238,7 +238,7 @@
			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));
			@@ -296,6 +296,8 @@
			}*/
			}



			@Override
			public List<MouldCheckListVo> findModCheckList(ModCheckDto modCheckDto) {
			SysUserInfo userInfo = UserInfoUtils.getInstance().getUserInfo();
			@@ -344,4 +346,8 @@
			return mouldMapper.getH5MouldInfo(mouldId);
			}

			@Override
			public List<Integer> allNumType() {
			return pipeInfoMapper.queryAllNumType();
			}
			}