From aa9c0c31a023efcac1e9a0c3b5796cdf482b2276 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 15 六月 2025 11:52:22 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 228abed..3a18e78 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -101,6 +101,10 @@
      */
     public synchronized void generateInboundWrk() {
         try {
+            List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskCtg,7));
+            if (!Cools.isEmpty(tasks)){
+                return;
+            }
             // 鏍规嵁杈撻�佺嚎plc閬嶅巻
             List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
                     .eq(Device::getDeviceType, DeviceCtgType.CONVEYOR.val())
@@ -168,6 +172,7 @@
                     if (staProtocol.isAutoing() && staProtocol.isLoading()
                             && staProtocol.isInEnable()
                             && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999))
+                            && staProtocol.getIsIn() == (short)1
                             && staProtocol.isPakMk()
                     ) {
 

--
Gitblit v1.9.1