From 9b4de84e744b2f76a24103e791086c647c1c3027 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 13 九月 2023 07:58:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java |   16 ++++------------
 1 files changed, 4 insertions(+), 12 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 e92e50e..77d1e17 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -72,7 +72,7 @@
                     TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                             .eq("loc_no",locMast.getLocNo())
                             .eq("barcode",locDetl.getMatnr())
-                            .eq("status",4)
+                            .eq("status",4)//瀹屾垚娴嬭瘯
                     );
                     if (!Cools.isEmpty(testMast)){
                         if (testMast.getStatus()==4){
@@ -82,7 +82,7 @@
                                 targetLocNo=locMastService.queryFreeLocMast(1,(short)4);
                             }
                             if (targetLocNo != null){
-                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt("9935"));
                                 //4.娴嬭瘯瀹屾垚涓婃姤
                                 CombParam combParam = new CombParam();
                                 combParam.setPackNo(locDetl.getMatnr());
@@ -146,7 +146,7 @@
                                     targetLocNo=locMastService.queryFreeLocMast(1,(short)2);
                                 }
                                 if (targetLocNo != null){
-                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
+                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9935);
                                     sign=true;
                                 }else {
                                     log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->娌℃湁绌哄簱浣�!");
@@ -230,7 +230,7 @@
                 wrkMast.setIoPri(13D); // 浼樺厛绾э細13
                 wrkMast.setCrnNo(1);
                 wrkMast.setSourceStaNo(203); // 婧愮珯
-                wrkMast.setStaNo(205); // 鐩爣绔�  2鍙峰爢鍨涙満鍏ュ簱绔�
+                wrkMast.setStaNo(206); // 鐩爣绔�  2鍙峰爢鍨涙満鍏ュ簱绔�
                 wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
                 wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
                 wrkMast.setPicking("N"); // 鎷f枡
@@ -261,14 +261,6 @@
                     locMast.setLocSts("R");
                     locMast.setModiTime(now);
 //                    locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
-
-                    CombParam combParam = new CombParam();
-                    combParam.setPackNo(wrkDetl.getMatnr());
-                    combParam.setLocNo(locMast.getLocNo());
-                    combParam.setPackSts(locMast.getPackStatus());
-                    combParam.setRequestTime(DateUtils.convert(new Date()));
-                    new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
                     if (!locMastService.updateById(locMast)) {
                         log.error("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
                         return false;

--
Gitblit v1.9.1