From 07c572bea979dbd3ee46ec24083cb1bdcc014e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 13:56:50 +0800
Subject: [PATCH] 一期找库位方法修改
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 615bd67..de208c9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -44,7 +44,8 @@
private IoCompleteService ioCompleteService;
@Autowired
private PltBarcodeService pltBarcodeService;
-
+ @Autowired
+ private MatCodeService matCodeService;
/**
* ERP鎺ュ彛鏄惁鍚敤
*/
@@ -99,14 +100,17 @@
for (WrkDetl wrkDetl : wrkDetls) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()).eq("supplier", wrkDetl.getSupplier()));
if (null != locDetl) {
- boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo());
+ boolean res = locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), wrkMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier());
+
+
if (!res) {
exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
} else {
WrkDetl wrk_no = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
- .eq("wrk_no", wrkMast.getWrkNo()));
-
+ .eq("wrk_no", wrkMast.getWrkNo()).eq("mat_no",wrkDetl.getMatNo()).eq("supplier",wrkDetl.getSupplier()));
+
+ MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", wrkDetl.getMatNo()));
locDetl = new LocDetl();
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
@@ -118,6 +122,11 @@
locDetl.setAllWeight(wrk_no.getAllWeight());
locDetl.setSource(wrk_no.getSource());
locDetl.setVendor(wrk_no.getVendor());
+ locDetl.setWeight(matCode.getWeight());
+ locDetl.setQtyBox(matCode.getStr6());
+ locDetl.setStr3(matCode.getStr3());
+ locDetl.setStr4(matCode.getStr4());
+ locDetl.setStr5(matCode.getStr5());
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
@@ -194,7 +203,7 @@
// 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滃伐浣滄槑缁嗘暟閲忎负0鏃讹紝鍒犻櫎搴撳瓨鏄庣粏
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
if (null != locDetl) {
- if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
+ if (!locDetlService.updateAnfme(locDetl.getQty() - wrkDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
}
@@ -253,7 +262,7 @@
for (WrkDetl wrkDetl:wrkDetls54) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()).eq("mat_no", wrkDetl.getMatNo()));
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo())) {
+ if (!locDetlService.updateAnfme(wrkDetl.getQty()+locDetl.getQty(), locMast.getLocNo(), wrkDetl.getMatNo(),wrkDetl.getSupplier())) {
exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matNo={1}]", wrkMast.getWrkNo(), wrkDetl.getMatNo());
}
} else {
--
Gitblit v1.9.1