From 26294d2966da7fe0311affc588fee234e3c6071b Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 06 五月 2025 14:17:36 +0800
Subject: [PATCH] 解决待机位和提升机互锁问题
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 692e9e6..eb854c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1215,7 +1215,7 @@
}
wrkMast.setWrkSts(WrkStsType.INBOUND_LIFT_RUN.sts);
- //wrkMast.setLiftNo(liftProtocol.getLiftNo());//鎻愬墠閿佸畾鎻愬崌鏈�
+ wrkMast.setLiftNo(liftProtocol.getLiftNo());//鎻愬墠閿佸畾鎻愬崌鏈�
wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
@@ -1320,10 +1320,7 @@
return false;
}
if (wrkMast.getStaNo() == 1031) {
-// if (staProtocol.getOutInModel() != 1) {
-// News.taskInfo(wrkMast.getWrkNo(),"{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
-// return false;
-// }
+
} else {
if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
--
Gitblit v1.9.1