From bb1975d8505229818207225b71d72683616c183b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 19 十一月 2025 12:54:46 +0800
Subject: [PATCH] 根据客户需求清单修改程序

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 e173bdb..17c7f67 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -38,6 +38,8 @@
     private OrderDetlService orderDetlService;
     @Autowired
     private InOutService inOutService;
+    @Autowired
+    private MatService matService;
 
     public ReturnT<String> start(WrkMast wrkMast) {
         // 4.鍏ュ簱瀹屾垚
@@ -123,8 +125,12 @@
                             locDetl.setModel(wrkDetl.getModel());
 
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
+                            Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
-                                inOut.setTemp1("鍦ㄥ簱");
+                                inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
+                                inOut.setBrand(wrkDetl.getBarcode());//鎵樼洏鏉$爜
+                                inOut.setTemp2(mat.getName());//濂楀彿
+                                inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
 //                                inOut.setModiTime(now.toString());
                             }
                             if (!inOutService.updateById(inOut)){
@@ -184,7 +190,9 @@
 
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
-                                inOut.setTemp1("涓嶅湪搴�");
+                                inOut.setTemp1("涓嶅湪搴�");//灞炴�� 鏄惁鍦ㄥ簱
+                                inOut.setBrand("");//鎵樼洏鏉$爜
+                                inOut.setTemp3("");
 //                                inOut.setModiTime(now.toString());
                             }
                             if (!inOutService.updateById(inOut)){
@@ -252,7 +260,9 @@
 
                             InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                             if (inOut != null){
-                                inOut.setTemp1("鍦ㄥ簱");
+                                inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
+                                inOut.setBrand(wrkDetl.getBarcode());//鎵樼洏鏉$爜
+                                inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
 //                                inOut.setModiTime(now.toString());
                             }
                             if (!inOutService.updateById(inOut)){
@@ -394,7 +404,9 @@
                     for (WrkDetl wrkDetl : wrkDetls101) {
                         InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
                         if (inOut != null){
-                            inOut.setTemp1("涓嶅湪搴�");
+                            inOut.setTemp1("涓嶅湪搴�");//灞炴�� 鏄惁鍦ㄥ簱
+                            inOut.setBrand("");//鎵樼洏鏉$爜
+                            inOut.setTemp3("");//搴撲綅鍙�
 //                            inOut.setModiTime(now.toString());
                         }
                         if (!inOutService.updateById(inOut)){

--
Gitblit v1.9.1