From b0aca4f6dc0d314c6ef336d915740e017b6fccee Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 16:09:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 89ebe97..c44cfd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
@@ -221,11 +221,11 @@
return false;
}
//褰�1011鍏ュ簱锛屾墭鐩樺湪鎻愬崌鏈洪噷锛�1014涔熷湪鍏ュ簱锛屽緟鏈轰綅琚�1014鍗犱綇锛屽幓鎻愬崌鏈洪噷鐨勪换鍔★紝灏忚溅浼氬崱浣�
- if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() == 1015) {
+ if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() != null && wrkMast.getStaNo() == 1015) {
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪1灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
- if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() == 1026) {
+ if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() != null && wrkMast.getStaNo() == 1026) {
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪5灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
--
Gitblit v1.9.1