From e428be424079be40c3885c9533067a41732823ab Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 01 四月 2024 21:12:10 +0800
Subject: [PATCH] #电视机  优化

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 600dbba..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) {

--
Gitblit v1.9.1