~zhangleilei/supipe.git

			@@ -159,12 +159,12 @@
			pipeInfo.setOutMod(PipeOutModType.IN.getValue()); //入模
			pipeInfo.setPipeNum(UUIDUtils.createPipeNum(proNumber,countPipeInPro));
			//pipeInfo.setRingNum();
			RingCompleteCheck completeCheck = pipeInfoMapper.queryRingCompleteByMod(mould.getMouldNum(),pipeInfo.getProId());
			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()));

			@@ -63,7 +63,7 @@

			RingCompleteCheck queryRingComplete(PipeInfo pipeinfo);

			RingCompleteCheck queryRingCompleteByMod(@Param("mouldNum") String mouldNum,@Param("proId") String proId);
			List<RingCompleteCheck> queryRingCompleteByMod(@Param("mouldNum") String mouldNum,@Param("proId") String proId);

			int queryMaxRingNum(String companyId);

			@@ -269,6 +269,7 @@
			where ssr.stock_type = 2 and YEAR(SYSDATE()) = YEAR(ssr.create_time) and MONTH(SYSDATE()) = MONTH(ssr.create_time)
			group by ssr.steel_id
			) c on steel.steel_id = c.steel_id
			ORDER BY c.monthStock desc
			</select>

			<!--获取静养区-->

	hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史