From 46f8920cdcbff803b8b51a927ad40f33ce060b32 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 20:43:49 +0800
Subject: [PATCH] 出库下发流程按照进仓编号的前后顺序下发;配置一个出库进仓编号出库数量阀值; 当运行中的进仓编号任务WrkSts=25、14、15并且小于该阀值时下发下一个进仓编号的出库任务

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 01f6c09..62ac520 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,7 +1,13 @@
 package com.zy.asrs.task;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.zy.asrs.entity.BasAgvMast;
+import com.zy.asrs.entity.BasArmMast;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasAgvMastService;
+import com.zy.asrs.service.BasArmMastLogService;
+import com.zy.asrs.service.BasArmMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkLogHandler;
@@ -23,6 +29,10 @@
     private WorkLogHandler workLogHandler;
     @Autowired
     private WrkMastService wrkMastService;
+    @Autowired
+    private BasArmMastService basArmMastService;
+    @Autowired
+    private BasAgvMastService basAgvMastService;
 
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
@@ -31,11 +41,6 @@
             return;
         }
         for (WrkMast wrkMast : wrkMasts) {
-            if(wrkMast.getIoType() != 11){
-                if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
-                    continue;
-                }
-            }
             ReturnT<String> result = workLogHandler.start(wrkMast);
             if (!result.isSuccess()) {
                 log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());

--
Gitblit v1.9.1