From 2983f5990702d55d025fee37d80fa43f2cc73e72 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 14 四月 2024 12:19:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 a853100..11d11fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3696,6 +3696,11 @@
if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
}
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
if (!basDevp.getEmptyMk().equals("Y")){
continue;
@@ -3773,6 +3778,11 @@
BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
+ }
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
}
if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
if (!basDevp.getEmptyMk().equals("Y")){
@@ -3856,6 +3866,11 @@
if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
}
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
if (!basDevp.getEmptyMk().equals("Y")){
continue;
--
Gitblit v1.9.1