From 4ce0a1b6c7712691a74f76890310f97c48215945 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 25 五月 2023 09:05:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index 6970920..e92e50e 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -61,7 +61,7 @@
         try {
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("loc_sts", "F")
-                    .eq("pack_status", 4)
+                    .eq("pack_status", 4)//娴嬭瘯澶辫触
                     .eq("row1", equipmentRow)
                     .eq("loc_type1", (short) 1)
                     .eq("fire_status",0)
@@ -113,7 +113,7 @@
         try {
             List<LocMast> locMasts2 = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("loc_sts", "F")
-                    .eq("pack_status", 4)
+                    .eq("pack_status", 3)//娴嬭瘯瀹屾垚
                     .eq("row1", equipmentRow)
                     .eq("loc_type1", (short) 1)
                     .eq("fire_status",0)
@@ -217,7 +217,7 @@
             } else if (Cools.isEmpty(locMast.getModiTime())){
                 log.error("搴撲綅:"+locMast.getLocNo()+"modiTime涓虹┖");
             } else if (Cools.isEmpty(locMast.getBarcode())){
-                log.error("搴撲綅:"+locMast.getLocNo()+"Pack鐮佷负绌�");
+                log.error("搴撲綅:"+locMast.getLocNo()+"鎵樼洏鐮佷负绌�");
             } else {
                 // 鐢熸垚宸ヤ綔鍙�
                 int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
@@ -263,7 +263,7 @@
 //                    locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
 
                     CombParam combParam = new CombParam();
-                    combParam.setPackNo(locMast.getBarcode());
+                    combParam.setPackNo(wrkDetl.getMatnr());
                     combParam.setLocNo(locMast.getLocNo());
                     combParam.setPackSts(locMast.getPackStatus());
                     combParam.setRequestTime(DateUtils.convert(new Date()));

--
Gitblit v1.9.1