From dfafabacf23bf22181d7c3f3665e684be7921f7d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 八月 2024 16:45:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index b6cc5b6..668fa5e 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -1055,8 +1055,10 @@
break;
// continue;
}
+ // 107鏃犵墿鎵嶈兘鍑猴紝鍏朵粬鏈夎浆杩愭灦鎵嶈兘鍑�
+ boolean loading = (staProtocol.getSiteId() == 107) != staProtocol.isLoading();
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+ if (staProtocol.isAutoing() && loading && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
log.warn("鍫嗗灈鏈哄嚭搴撳懡浠や笅鍙戯細"+staProtocol.getWorkNo()+","+staProtocol.isOutEnable()+","+staProtocol.getSiteId());
@@ -3042,11 +3044,11 @@
if (wrkMast.getStaNo() == 104) {
// 鍒ゆ柇鍑哄簱绔欑偣鎯呭喌,鍙叆锛屽爢鍨涙満鍙互鍙栬揣锛屽彲鍑猴紝鍫嗗灈鏈哄彲浠ユ斁璐�
- if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable()) {
+ if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable() || !staProtocol105.isLoading()) {
return;
}
} else if (wrkMast.getStaNo() == 107) {
- if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable()) {
+ if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable() || staProtocol107.isLoading()) {
return;
}
}
--
Gitblit v1.9.1