From 277797abc0adb5e08c912abc3c10b1a1826d3460 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 07 八月 2025 15:38:40 +0800
Subject: [PATCH] 取消任务延迟下发方案

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 483bf28..c9ad696 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -381,9 +381,9 @@
             for (WrkMast wrkMast : wrkMasts) {
                 Integer rgvSstaNo = wrkMast.getRgvSstaNo();
                 // 1090锛�1089,1086,1083 鎸�1083绔欑偣浣嶇疆璁$畻锛岃兘鍙�1083锛屽氨鑳藉彇1090锛�1089锛�1086锛岄伩鍏嶄换鍔″欢杩熶笅鍙戞柟妗堜竴鐩寸粰1083鍙�
-                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086 || rgvSstaNo == 1105) {
-                    rgvSstaNo = 1083;
-                }
+//                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086 || rgvSstaNo == 1105) {
+//                    rgvSstaNo = 1083;
+//                }
                 BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 绔欑偣
                 long position = basDevpPositions.getPlcPosition(); // 璧峰绔欎綅缃�
                 position += 50; // 灏忚溅鍙栬揣瀹氫綅绮惧害 +- 50,绔欑偣浣嶇疆10000锛屽皬杞﹀湪10050涔熸槸鍙互鍙栫殑
@@ -401,7 +401,7 @@
 //                StringBuilder sb = new StringBuilder();
 //                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
 //                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
-//                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
+//                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getRgvPos()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
 //                }
 //                log.info(sb.toString());
 

--
Gitblit v1.9.1