From 1cc361ec5fca7550ba01f0a6ecf058e84a5a20ad Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 16:25:18 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 56fda71..e173bdb 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -120,13 +120,14 @@
                             locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
+                            locDetl.setModel(wrkDetl.getModel());
 
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
                                 inOut.setTemp1("鍦ㄥ簱");
-                                inOut.setModiTime(now.toString());
+//                                inOut.setModiTime(now.toString());
                             }
-                            if (inOutService.updateById(inOut)){
+                            if (!inOutService.updateById(inOut)){
                                 return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
                             }
 
@@ -184,9 +185,9 @@
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
                                 inOut.setTemp1("涓嶅湪搴�");
-                                inOut.setModiTime(now.toString());
+//                                inOut.setModiTime(now.toString());
                             }
-                            if (inOutService.updateById(inOut)){
+                            if (!inOutService.updateById(inOut)){
                                 return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
                             }
 
@@ -252,9 +253,9 @@
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
                                 inOut.setTemp1("鍦ㄥ簱");
-                                inOut.setModiTime(now.toString());
+//                                inOut.setModiTime(now.toString());
                             }
-                            if (inOutService.updateById(inOut)){
+                            if (!inOutService.updateById(inOut)){
                                 return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
                             }
 
@@ -394,9 +395,9 @@
                         InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                         if (inOut != null){
                             inOut.setTemp1("涓嶅湪搴�");
-                            inOut.setModiTime(now.toString());
+//                            inOut.setModiTime(now.toString());
                         }
-                        if (inOutService.updateById(inOut)){
+                        if (!inOutService.updateById(inOut)){
                             return FAIL.setMsg("鏇存柊妯″叿灞炴�уけ璐�");
                         }
                     }

--
Gitblit v1.9.1