From de9471942519d08f561fb8c3648861ff43b4cc52 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 19 五月 2025 09:38:41 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 14f026d..e064d65 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -158,6 +158,11 @@
                     errMsg = "鎵爜澶辫触";
                     back = true;
                 }
+//                if (!back && staProtocol.getWeight() == 0.0) {
+//                    errMsg = "閲嶉噺鑾峰彇澶辫触";
+//                    back = true;
+//                }
+
 
                 // 閫�鍥�
                 if (back) {
@@ -245,6 +250,7 @@
                         param.setIoType(1);
                         param.setSourceStaNo(inSta.getStaNo());
                         param.setLocType1(locTypeDto.getLocType1());
+                        param.setWeight(staProtocol.getWeight());
                         String response = new HttpHandler.Builder()
                                 .setTimeout(30,TimeUnit.SECONDS)
                                 .setUri(wmsUrl)
@@ -846,7 +852,7 @@
                         }
 
                     } else {
-                        News.errorNoLog("" + mark + " - 6" + " - 鍫嗗灈鏈轰俊鎭笉绗﹀悎鍏ュ簱鏉′欢锛侊紒锛�"
+                         News.errorNoLog("" + mark + " - 6" + " - 鍫嗗灈鏈轰俊鎭笉绗﹀悎鍏ュ簱鏉′欢锛侊紒锛�"
                                 + " 鍫嗗灈鏈虹姸鎬侊細" + crnProtocol.modeType + "==鑷姩AUTO锛�" + CrnModeType.AUTO
                                 + "銆佸爢鍨涙満浠诲姟鍙凤細" + crnProtocol.getTaskNo() + "==宸ヤ綔妗d换鍔″彿锛�" + wrkMast.getWrkNo().shortValue()
                                 + "銆佺姸鎬佹灇涓撅細" + crnProtocol.statusType + "==WAITING锛�90 //浠诲姟瀹屾垚绛夊緟WCS纭)锛�" + CrnStatusType.WAITING
@@ -932,7 +938,7 @@
             }
             // 搴撲綅绉昏浆
             //mark - 3 - ....
-            this.locToLoc(crn, crnProtocol, mark);
+//            this.locToLoc(crn, crnProtocol, mark);
 //            this.crnRebackHp(crnProtocol, crnThread);
 
         }

--
Gitblit v1.9.1