From 85deecd28f589f280a3db19fb35fcb6d9081b781 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 09:57:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++++++++++------
1 files changed, 17 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 2e0151d..d6605e3 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()); // 搴撲綅鍙�
@@ -114,6 +118,13 @@
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setAllQty(wrk_no.getAllQty());
+ locDetl.setAllWeight(wrk_no.getAllWeight());
+ locDetl.setSource(wrk_no.getSource());
+ locDetl.setVendor(wrk_no.getVendor());
+ locDetl.setWeight(matCode.getWeight());
+ locDetl.setQtyBox(matCode.getStr6());
+
if (!Cools.isEmpty(wrk_no)){
locDetl.setMemo(wrk_no.getMemo());
locDetl.setSupplier(wrk_no.getSupplier());
@@ -190,7 +201,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());
}
@@ -249,7 +260,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