From 906378a251838ab4d4f3b7f7ecc461764ea7090f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 12 十月 2024 10:54:39 +0800
Subject: [PATCH] 空闲理货

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 a0fcb1b..ec618ba 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.service.*;
@@ -42,6 +43,9 @@
     private OrderDetlService orderDetlService;
     @Resource
     private OrderDetlMapper orderDetlMapper;
+
+    @Resource
+    private LocDetlMapper locDetlMapper;
 
     @Resource
     private OrderMapper orderMapper;
@@ -113,7 +117,8 @@
                             locDetl.sync(wrkDetl);
                             locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
                             locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
-                            locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
+                            locDetl.setZpallet(wrkMast.getBarcode()); // 鎵樼洏鏉$爜
+                            locDetl.setBarcode(wrkMast.getBarcode());
                             locDetl.setModiTime(now);
                             locDetl.setAppeTime(now);
                             locDetl.setBatch("");
@@ -199,6 +204,10 @@
 //                        } catch (Exception ignore){}
 
                     }
+
+                    // 淇敼鎹℃枡鍏ュ簱鐨勫簱瀛樻槑缁嗙殑鐞嗚揣鐘舵�佷负寰呯悊璐�
+                    locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),1);
+
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
                     if (locMast.getLocSts().equals("Q")) {
                         locMast.setLocSts("F");
@@ -453,6 +462,19 @@
                         return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                     }
                     break;
+                // 绌洪棽鐞嗚揣鍏ュ簱
+                case 59:
+
+                    // 淇敼搴撲綅鐘舵�� S ====>> F
+                    if (locMast.getLocSts().equals("S")) {
+                        locMast.setLocSts("F");
+                        locMast.setModiTime(now);
+                        locMastService.updateById(locMast);
+                    }
+
+                    // 淇敼绌洪棽鐞嗚揣鍏ュ簱鐨勫簱瀛樻槑缁嗙殑鐞嗚揣鐘舵�佷负寰呯悊璐�
+                    locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),0);
+                    break;
                 default:
                     break;
             }

--
Gitblit v1.9.1