From b58e87a6463ebf5109c49489c35260d7e8708653 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期一, 04 十二月 2023 11:11:56 +0800
Subject: [PATCH] 人脸 缓存同步菜单

---
 hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java
index aeb4e33..7ce7f75 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java
@@ -159,7 +159,7 @@
                             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));
@@ -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();
+    }
 }

--
Gitblit v1.9.3