From 19179e6861cbae74e5fb570c5582a720b0f267fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 14 十二月 2022 10:16:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 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 3ad331c..14cb132 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -119,9 +119,18 @@
                         }
                     }
                     // 淇敼 erp Goods 琛�
-                    List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-                    for (WrkDetl wrkDetl : wrkDetls0) {
-                        Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+                    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());
@@ -140,9 +149,18 @@
                     }
                 }
                 // 淇敼 erp Goods 琛�
-                List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-                for (WrkDetl wrkDetl : wrkDetls0) {
-                    Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+                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());

--
Gitblit v1.9.1