From 95a2dcd7a8cc10511ac3eb75e1854ad73a4fa244 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 05 五月 2023 16:59:06 +0800
Subject: [PATCH] 订单系统优化

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 baf969e..c72f98c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -93,8 +93,14 @@
                     }
                     // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
                     for (WrkDetl wrkDetl : wrkDetls) {
-
-                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+                        LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+                                .eq("loc_no" , locMast.getLocNo())
+                                .and()
+                                .eq("matnr",wrkDetl.getMatnr())
+                                .and()
+                                .eq("batch",wrkDetl.getBatch())
+                                .and()
+                                .eq("order_no",wrkDetl.getOrderNo()));
                         if (null != locDetl) {
                             if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
 //                                exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -104,6 +110,7 @@
                         } else {
                             locDetl = new LocDetl();
                             locDetl.sync(wrkDetl);
+                            locDetl.setOrderNo(wrkDetl.getOrderNo());//璁㈠崟缂栧彿
                             locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
                             locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜

--
Gitblit v1.9.1