From 463e7888b0f0240a2d5e278c6b6f17a748e828b2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 14 十二月 2022 11:06:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 49e3237..1b26996 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -74,16 +74,16 @@
if (!Cools.isEmpty(wrkDetls)) {
for (WrkDetl wrkDetl : wrkDetls) {
// Goods 琛�
- Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
if (!Cools.isEmpty(goods)) {
if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
}
} else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getBatch());
}
// OrderDetl 琛�
- OrderDetl orderDetl = orderDetlService.selectByMatnr(wrkDetl.getMatnr());
+ OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getBatch());
if (!Cools.isEmpty(orderDetl)) {
Order order = orderService.selectById(orderDetl.getOrderId());
DocType docType = docTypeService.selectById(order.getDocType());
@@ -118,15 +118,57 @@
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
+ // 淇敼 erp Goods 琛�
+ for (WrkDetl wrkDetl : wrkDetls) {
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
+ if (!Cools.isEmpty(goods)) {
+ if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
+ log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
+ }
+ } else {
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ }
+ }
+ for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
+ if (!Cools.isEmpty(goods)) {
+ if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
+ log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
+ }
+ } else {
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ }
+ }
}
- // 鍑哄簱 --------------------------------------------------------------------------------
+ // 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 18) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
+ // 淇敼 erp Goods 琛�
+ for (WrkDetl wrkDetl : wrkDetls) {
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
+ if (!Cools.isEmpty(goods)) {
+ if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
+ log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
+ }
+ } else {
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ }
+ }
+ for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
+ if (!Cools.isEmpty(goods)) {
+ if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
+ log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
+ }
+ } else {
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ }
+ }
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
--
Gitblit v1.9.1