张晓波
2023-12-11 24fc3f18bbeddda342ddf3a3d7f2dd4ef9feab3f
未成环的可能有很多
已修改2个文件
8 ■■■■ 文件已修改
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/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java
@@ -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()));
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java
@@ -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);