From f8971b95d041a8205846a0b55bc75421bbbb84c3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 六月 2023 13:37:30 +0800
Subject: [PATCH] #平库库位优化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index bee7db5..9558c78 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -15,6 +15,7 @@
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.SaasUtils;
import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
@@ -161,6 +162,7 @@
waitPakin.setModiTime(now);
waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
+ waitPakin.setWeight(param.getCombMats().get(0).getWeight());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -228,6 +230,7 @@
waitPakin.setModiTime(now);
waitPakin.setOwner(detlDto.getOwner());
waitPakin.setUuid(uuid);
+ waitPakin.setWeight(param.getCombMats().get(0).getWeight());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -559,13 +562,23 @@
manLocDetl.setBatch(jsonOrderDetl.getBatch());
manLocDetl.setUuid(uuid);
manLocDetl.setOwner(orderDetl.getOwner());
+ manLocDetl.setWeight(jsonOrderDetl.getWeight());
if(!manLocDetlService.insert(manLocDetl)){
- return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
} else {
- if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){
+ if (checkManLocDetl.getWeight() == null){
+ checkManLocDetl.setWeight(0.0);
+ }
+ if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
+ node.getName(),
+ jsonOrderDetl.getMatnr(),
+ jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
+ )<=0
+ ){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
+
}
orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
@@ -588,7 +601,11 @@
return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
}
orderService.checkComplete(order.getOrderNo());
+
+ SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
}
+
+
return R.ok("涓婃灦瀹屾垚");
}
@@ -642,12 +659,18 @@
return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
}
Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+ Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
+ checkManLocDetl.setAnfme(finalQty);
+ checkManLocDetl.setWeight(weight);
+ if (weight < 0){
+ return R.error("鍑哄簱閲嶉噺鏈夎锛�");
+ }
if (finalQty < 0){
// if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0) {
return R.error("鏁伴噺鏈夎锛�");
// }
}else {
- if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+ if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch(),weight)<=0){
return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
}
}
@@ -698,6 +721,7 @@
return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
}
}
+ SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
}
return R.ok("涓嬫灦瀹屾垚");
--
Gitblit v1.9.1