From d9280b0c2ceab9db2c60c0af1a74e83f91cc74fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 14 四月 2025 12:56:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
index caa7842..71b876b 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
@@ -119,7 +119,7 @@
private boolean shuttleMoveExecuteTransportLiftStepCallShuttle(WrkMast wrkMast) {
Date now = new Date();
//灏忚溅绉诲姩鑷崇珯鐐� 301.鐢熸垚灏忚溅绉诲簱浠诲姟 ==> 鍛煎彨灏忚溅鑷冲彇璐х偣
- if (wrkMast.getWrkSts() == WrkStsType.NEW_MOVE.sts) {
+ if (wrkMast != null && wrkMast.getWrkSts() == WrkStsType.NEW_MOVE.sts) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
if (shuttleThread == null) {
@@ -134,7 +134,7 @@
return false;
}
StaProtocol staProtocol = devpThread.getStation().get(Utils.getLev(wrkMast.getSourceLocNo()) == 1 ? 1015 : 1026);
- if (!staProtocol.isLoading()) {
+ if (!staProtocol.isLoading() || !staProtocol.isAutoing()) {
log.info("{}浠诲姟锛寋}鍙疯緭閫佺嚎鏃犵墿", wrkMast.getWrkNo(), wrkMast.getSourceStaNo());
News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙疯緭閫佺嚎鏃犵墿", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
return false;
@@ -351,7 +351,6 @@
}
-
//鍒ゆ柇鎻愬崌鏈烘ゼ灞�
if (liftProtocol.getLev() == Utils.getLev(shuttleProtocol.getCurrentLocNo())) {
//鎻愬崌鏈哄湪灏忚溅妤煎眰
@@ -462,7 +461,6 @@
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁灏忚溅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
-
//鍒ゆ柇鎻愬崌鏈烘ゼ灞�
@@ -803,7 +801,7 @@
Date now = new Date();
//灏忚溅绉诲姩鍒扮洰鏍囧簱浣嶄腑 309.灏忚溅杩佸嚭鎻愬崌鏈哄畬鎴� ==> 310.灏忚溅绉诲姩涓�
- if (wrkMast.getWrkSts() == WrkStsType.MOVE_IN_NO_LIFT_1.sts) {
+ if (wrkMast != null && wrkMast.getWrkSts() == WrkStsType.MOVE_IN_NO_LIFT_1.sts) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
--
Gitblit v1.9.1