From d3e6773ef7cd0e11a444b41ec3da15938fabd85b Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 13:16:38 +0800
Subject: [PATCH] 产线管理
---
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..6cfe45d 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,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();
+ }
}
--
Gitblit v1.9.3