From 168aa783b5eaf7f1cb34be67b7d3f9d7fda13bd2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 09:36:59 +0800
Subject: [PATCH] #杰克缝纫机立库 【添加订单状态模块】

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 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 125e2a5..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,22 +87,27 @@
                             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)) {
                                 exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                             }
                         }
-                        // 鏇存柊鍏ュ簱閫氱煡妗� status ===>> Y
-                        WaitPakin setParam = new WaitPakin();
-                        setParam.setStatus("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());
-                        }
+                        // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+                        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