From ac72b4d88f2ffd3eb6dc490800229efc7883550a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 19 六月 2024 16:37:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 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 8309d50..60607bd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2586,18 +2586,25 @@
continue;
}
//鍒ゆ柇宸ヤ綔缁撴潫浣嶇疆鐘舵��
+ boolean signDev = false;
BasDevp devNo = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", wrkMastSta.getStaEnd()));
+ if (devNo.getDevNo()==113){
+ BasDevp devNo114 = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 114));
+ if (!Cools.isEmpty(devNo114)){
+ if (devNo114.getOutEnable().equals("Y")){
+ signDev = true;
+ }
+ }
+ }
if (!Cools.isEmpty(devNo)){
if (devNo.getAutoing().equals("Y") && !devNo.getWrkNo().equals(0) && !devNo.getLoading().equals("N")){
continue;
}
- if (!devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N")){
- if (devNo.getDevNo()==113){
+ if (!signDev && devNo.getDevNo()==113){
+ if (!devNo.getAutoing().equals("Y") || !devNo.getWrkNo().equals(0) || !devNo.getLoading().equals("N")){
wrkEnable = true;
+ continue;
}
- continue;
- }
- if (devNo.getDevNo()==113){
if (!devNo.getOutEnable().equals("Y")){
wrkEnable = true;
continue;
--
Gitblit v1.9.1