From 6e9d75aeb78c4a635a607ab0592f651dc3bf9643 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 04 十二月 2023 11:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/mouldcheck/service/impl/ModCheckServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 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 ce9a32b..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
@@ -17,6 +17,7 @@
import com.thhy.mobile.modules.biz.pipeinfo.entity.MaterialInfo;
import com.thhy.mobile.modules.biz.pipeinfo.entity.PipeInfo;
import com.thhy.mobile.modules.biz.pipeinfo.mapper.PipeInfoMapper;
+import com.thhy.mobile.modules.biz.steelcheck.entity.SteelStockRecord;
import com.thhy.mobile.modules.biz.steelproduce.entity.ProduceDto;
import com.thhy.mobile.modules.biz.steelproduce.entity.SteelProduce;
import com.thhy.mobile.modules.biz.steelproduce.mapper.SteelProduceMapper;
@@ -141,6 +142,10 @@
if(compareResult){//匹配成功
//更改钢筋笼产品入模状态
steelProduceMapper.updateisModel(new ProduceDto(1,modCheckDto.getProduceNumber()));
+ //钢筋笼库存记录
+ SteelStockRecord steelStockRecord = new SteelStockRecord(steelProduce,true);
+ steelStockRecord.setModCheckId(mouldCheck.getModCheckId());
+ steelStockMapper.insertSteelStockRecord(steelStockRecord);
//减掉钢筋笼库存
steelStockMapper.updateMinusStock(new SteelStock(steelProduce));
//更新模具循环次数
@@ -154,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));
@@ -199,7 +204,7 @@
String proId = modCheckDto.getProId();
try {
- if(ringNum.length()>5){
+ if(ringNum.length()>4){
throw new BasicException(BasicStatus.RING_NOT_DIS);
}
Integer.parseInt(ringNum);
@@ -207,14 +212,14 @@
throw new BasicException(BasicStatus.RING_NOT_DIS);
}
- String newRingNum = UUIDUtils.addZeroNoPlus(Integer.parseInt(ringNum),5);
+ String newRingNum = UUIDUtils.addZeroNoPlus(Integer.parseInt(ringNum),4);
int count = pipeInfoMapper.countByRingNum(newRingNum);
if(count>0){
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());
});*/
@@ -233,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));
@@ -291,6 +296,8 @@
}*/
}
+
+
@Override
public List<MouldCheckListVo> findModCheckList(ModCheckDto modCheckDto) {
SysUserInfo userInfo = UserInfoUtils.getInstance().getUserInfo();
@@ -339,4 +346,8 @@
return mouldMapper.getH5MouldInfo(mouldId);
}
+ @Override
+ public List<Integer> allNumType() {
+ return pipeInfoMapper.queryAllNumType();
+ }
}
--
Gitblit v1.9.3