From 0a58dc2ed7c8349efc4e7dd0b45d8c6ab7e6f9df Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 三月 2021 11:07:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 7524b50..bf03c36 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -87,6 +87,8 @@
                             locDetl = new LocDetl();
                             locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
                             VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+                            locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+                            locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
                             if (!locDetlService.insert(locDetl)) {
@@ -94,15 +96,18 @@
                             }
                         }
                         // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
-                        WaitPakin setParam = new WaitPakin();
-                        setParam.setIoStatus("Y");
-                        boolean updateRes = waitPakinService.update(setParam
-                                , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
-                                        .eq("matnr", wrkDetl.getMatnr())
-                                        .eq("anfme", wrkDetl.getAnfme()));
-                        if (!updateRes && updateRes) {
-                            exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗eけ璐ワ紱[workNo={0}]", wrkMast.getWrkNo());
-                        }
+                        try {
+                            WaitPakin setParam = new WaitPakin();
+                            setParam.setIoStatus("Y");
+                            boolean updateRes = waitPakinService.update(setParam
+                                    , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
+                                            .eq("matnr", wrkDetl.getMatnr())
+                                            .eq("anfme", wrkDetl.getAnfme()));
+                            if (!updateRes && updateRes) {
+                                exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊鍏ュ簱閫氱煡妗eけ璐ワ紱[workNo={0}]", wrkMast.getWrkNo());
+                            }
+                        } catch (Exception ignore){}
+
                     }
                     // 淇敼搴撲綅鐘舵�� S ====>> F
                     if (locMast.getLocSts().equals("S")) {
@@ -161,6 +166,8 @@
                             locDetl = new LocDetl();
                             locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
                             VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+                            locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+                            locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
                             if (!locDetlService.insert(locDetl)) {

--
Gitblit v1.9.1