From 4e4aaf7b1b8dc57377e9cdc8c90e53c41f835e6f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 六月 2024 10:33:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/BareBoardScheduler.java |   92 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index b16e89c..c461257 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -2,10 +2,11 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
 import com.zy.asrs.task.handler.BareBoardHandler;
 import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.common.properties.SlaveWmsParameterProperties;
 import com.zy.system.entity.Config;
 import com.zy.system.service.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,12 +27,91 @@
     private BareBoardHandler bareBoardHandler;
     @Autowired
     private ConfigService configService;
+    @Autowired
+    private BasDevpService basDevpService;
+    @Autowired
+    private BasRgvService basRgvService;
+    @Autowired
+    private RgvOneSignService rgvOneSignService;
+    @Autowired
+    private WrkMastStaService wrkMastStaService;
+    @Autowired
+    private SlaveWmsParameterProperties slaveWmsParameterProperties;
+
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    private void execute(){//鑷姩璋冪┖鏉垮嚭搴� 2妤肩爜鍨涗綅缃�
+//        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+//            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
+//            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+//                BasDevp basDevp = basDevpService.selectById(213);
+//                if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+//                    bareBoardHandler.start(213);
+//                }
+//            }
+//        }
+//    }
+
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    private void executeOne() {//鑷姩璋冪┖鏉垮嚭搴� 1妤肩爜鍨涗綅缃�
+//        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+//            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
+//            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+//                boolean sign = true;
+//                WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+//                        .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
+//                WrkMastSta wrkMastSta2 = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
+//                        .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
+//                if (Cools.isEmpty(wrkMastSta) || !Cools.isEmpty(wrkMastSta2)){
+//                    sign=false;
+//                }
+//                RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+//                if (rgvOneSign.getRgvOneSign()!=1 || !sign){
+//                    sign = false;
+//                }else {
+//                    List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
+//                    for (BasRgv basRgv : basRgvs){
+//                        if (basRgv.getLoaded2()!=0 && basRgv.getRgvSts()==3){
+//                            sign = false;
+//                            break;
+//                        }
+//                    }
+//                }
+//
+//                if (sign){
+//                    bareBoardHandler.start(122);
+//                }
+////            }
+//            }
+//        }
+//    }
 
     @Scheduled(cron = "0/3 * * * * ? ")
-    private void execute(){
-        Config config = configService.selectById(10468);
-        if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
-            bareBoardHandler.start();
+    private void execute1(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠�  172
+        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+            Integer devNo = 173;
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
+            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){
+                    bareBoardHandler.startYx(devNo,count);
+                }
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/3 * * * * ? ")
+    private void execute2(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦涓�妤�
+        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+            Integer devNo = 448;
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard448"));
+            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
+                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 421).le("dev_no", devNo).eq("loading", "Y"));
+                int count = 25;
+                if (loadIngCount<count){
+                    bareBoardHandler.startYx(devNo,count);
+                }
+            }
         }
     }
 

--
Gitblit v1.9.1