From 5cbd175cff604021ddf35e8a9399362402897029 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 01 四月 2024 15:45:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 184421c..cd44146 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1291,7 +1291,7 @@
continue;
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
- && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+ && staDetl.getCanining() != null && staDetl.getCanining().equals("Y") && staDetl.getWrkNo().equals(wrkMast.getWrkNo())) {
flag = true;
}
if (!flag) {
@@ -3936,7 +3936,7 @@
continue;
}
if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
- if (basDevp.getEmptyMk().equals("Y")){
+ if (!basDevp.getEmptyMk().equals("Y")){
continue;
}
}
--
Gitblit v1.9.1