From c7ecb255c9e685725095be2a6bd74b1696d4af22 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 07 八月 2025 16:14:53 +0800
Subject: [PATCH] rgv界面优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 643a517..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,11 +381,12 @@
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涔熸槸鍙互鍙栫殑
TreeMap<Long, RgvProtocol> map = new TreeMap<>();
for (RgvProtocol rgvProtocol : rgvProtocolList) {
long distance;
@@ -400,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());
@@ -568,15 +569,16 @@
&& rgvProtocol.getModeType() == RgvModeType.AUTO
&& rgvProtocol.getTaskNo1() != 0
) {
- log.info("{}鍙峰皬杞﹀皬杞﹀彇璐ц秺浣嶏紝鐘舵�亄}锛屽弬鏁皗}",rgvProtocol.getRgvNo(),rgvProtocol.getStatusType(),rgvProtocol);
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvProtocol.getTaskNo1().longValue()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvProtocol.getTaskNo1().longValue())
+ .eq("rgv_no",rgvProtocol.getRgvNo()));
if (Cools.isEmpty(wrkMast)) {
- log.error("鏈煡鍒板皬杞︽墽琛屼换鍔★紒" + rgvProtocol.getTaskNo1());
+ log.error(rgvProtocol.getRgvNo() + "灏忚溅鍙栬揣瓒婁綅鏈煡鍒板皬杞︽墽琛屼换鍔★紒" + rgvProtocol.getTaskNo1());
continue;
} else if(wrkMast.getWrkSts() != 10) {
- log.warn("鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
+ log.warn(rgvProtocol.getRgvNo() + "灏忚溅鍙栬揣瓒婁綅鎵ц浠诲姟鐘舵�佷笉绗﹀悎锛�" + rgvProtocol.getTaskNo1());
continue;
}
+ log.info("{}鍙峰皬杞﹀皬杞﹀彇璐ц秺浣嶏紝鐘舵�亄}锛屽弬鏁皗}",rgvProtocol.getRgvNo(),rgvProtocol.getStatusType(),rgvProtocol);
boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
if (!rgvComplete) {
log.error("灏忚溅鍙栬揣瓒婁綅,浠诲姟鍙栨秷,澶嶄綅澶辫触锛屽皬杞﹀彿{}锛�", rgvProtocol.getRgvNo());
--
Gitblit v1.9.1