From 4c8ece9325b6976e4d07e0985edc12522d8ec48a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 15 十二月 2022 08:42:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 62cca94..d9e52fc 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -83,7 +83,8 @@
log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getBatch());
}
// OrderDetl 琛�
- OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getMatnr());
+ OrderDetl orderDetl = orderDetlService.selectItemOfBatch(wrkDetl.getMatnr(), wrkDetl.getBatch());
+// OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getBatch());
if (!Cools.isEmpty(orderDetl)) {
Order order = orderService.selectById(orderDetl.getOrderId());
DocType docType = docTypeService.selectById(order.getDocType());
@@ -119,8 +120,17 @@
}
}
// 淇敼 erp Goods 琛�
- List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetls0) {
+ 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)) {
@@ -140,8 +150,17 @@
}
}
// 淇敼 erp Goods 琛�
- List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetls0) {
+ 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)) {
--
Gitblit v1.9.1