From 4c7a7c71c62c76f75310f5fba84f034962501ae7 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 14 七月 2024 15:37:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/BareBoardScheduler.java |   11 ++++++++---
 src/main/resources/mapper/WrkMastMapper.xml            |    1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 8f71dfd..736cedd 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -37,6 +37,8 @@
     private WrkMastStaService wrkMastStaService;
     @Autowired
     private SlaveWmsParameterProperties slaveWmsParameterProperties;
+    @Autowired
+    private WrkMastService wrkMastService;
 
 //    @Scheduled(cron = "0/3 * * * * ? ")
 //    private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
@@ -93,7 +95,8 @@
             if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                 int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", devNo).eq("loading", "Y"));
                 int count = 10;
-                if (loadIngCount<count){
+                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+                if (loadIngCount+wrkCount<count){
                     bareBoardHandler.startYx(devNo,count);
                 }
             }
@@ -108,7 +111,8 @@
             if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                 int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 266).le("dev_no", devNo).eq("loading", "Y"));
                 int count = 5;
-                if (loadIngCount<count){
+                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+                if (loadIngCount+wrkCount<count){
                     bareBoardHandler.startYx(devNo,count+5);
                 }
             }
@@ -123,7 +127,8 @@
             if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                 int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 422).le("dev_no", devNo).eq("loading", "Y"));
                 int count = 20;
-                if (loadIngCount<count){
+                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
+                if (loadIngCount+wrkCount<count){
                     bareBoardHandler.startYx(devNo,count);
                 }
             }
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 77c3d7c..702ede2 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -79,6 +79,7 @@
         or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=15 and io_type = 110 and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>

--
Gitblit v1.9.1