From 6e042d7f0e1982cf54deedba6fe4ddfe8353af13 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 27 六月 2024 09:37:11 +0800
Subject: [PATCH] 自动清空agv空库位库存

---
 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index a706936..cf3ea35 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.Cools;
 import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.service.AgvBasDevpService;
 import com.zy.asrs.service.AgvWrkMastService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.AgvWrkMastHandler;
@@ -31,32 +32,38 @@
     AgvWrkMastHandler agvWrkMastHandler;
     @Autowired
     AgvWrkMastService agvWrkMastService;
+    @Autowired
+    AgvBasDevpService agvBasDevpService;
 
 
     /*
-    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴�)鐨勬暟鎹�
+    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 锛�1.鍏ュ簱 || 53锛屾嫞鏂欏叆搴� || 57.鐩樼偣鍏ュ簱 || 10.绌烘澘鍏ュ簱 || 11.搴撴牸绉昏浇)鐨勬暟鎹�
      */
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/2 * * * * ? ")
     public void excutePutwayWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                 .eq("wrk_sts", 205)
                 .andNew().eq("io_type",53)
-                .or().eq("io_type",1));
+                .or().eq("io_type",1)
+                .or().eq("io_type",57)
+                .or().eq("io_type",10)
+                .or().eq("io_type",11));
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
-                ReturnT<String> returnT = agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
+                agvWrkMastHandler.completedPutWayWrk(agvWrkMast);
             });
         }
     }
 
     /*
-    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚 涓� 101鍑哄簱绫诲瀷鐨勬暟鎹�
+    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负206.瀹瑰櫒绂诲満瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
      */
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/2 * * * * ? ")
     public void excuteCarryWrk(){
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 207)
-                .eq("io_type",101));
+                .eq("wrk_sts", 206)
+                .andNew().eq("io_type",110)
+                .or().eq("io_type",101));
         if(!Cools.isEmpty(agvWrkMastList)){
             agvWrkMastList.stream().forEach(agvWrkMast -> {
                 ReturnT<String> returnT = agvWrkMastHandler.completedCarryWrk(agvWrkMast);
@@ -66,15 +73,17 @@
 
     /*
     putaway锛氫笂鏋�
+    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷f枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
      */
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/2 * * * * ? ")
     public void startPutwayWrk(){
-
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
-                .eq("wrk_sts", 201)   //201.鐢熸垚鍏ュ簱浠诲姟ID
-                .andNew().eq("io_type", 53).or() //53.鎷f枡鍐嶅叆搴�
-                .eq("io_type", 1)).getRecords();
+                .eq("wrk_sts", 201)
+                .andNew().eq("io_type", 53)
+                .or().eq("io_type", 1)
+                .or().eq("io_type", 10)
+                .or().eq("io_type", 57)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
             try {
@@ -87,15 +96,19 @@
 
     /*
     carry锛氭惉杩愶紝缁熸寚鍑哄簱銆佺Щ搴撱�佺偣鍒扮偣鎼繍绛�
+    瀹氭椂澶勭悊AGV宸ヤ綔妗d腑宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓�(鍑哄簱绫诲瀷涓� 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 11.搴撴牸绉绘牻 || 110.绌烘澘鍑哄簱 || 107.鐩樼偣鍑哄簱)鐨勬暟鎹�
      */
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0/2 * * * * ? ")
     public void startCarryWrk(){
-
         List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
                 ,new EntityWrapper<AgvWrkMast>()
-                        .eq("wrk_sts", 21)   //21.鐢熸垚鍑哄簱浠诲姟
-                        .andNew().eq("io_type", 101).or()
-                        .eq("io_type", 103)).getRecords();
+                        .eq("wrk_sts", 21)
+                        //.like("loc_no","@")
+                        .andNew().eq("io_type", 101)
+                        .or().eq("io_type", 103)
+                        .or().eq("io_type", 11)
+                        .or().eq("io_type", 110)
+                        .or().eq("io_type", 107)).getRecords();
 
         if(!Cools.isEmpty(agvWrkMastList)){
             try {
@@ -105,4 +118,19 @@
             }
         }
     }
+
+    /*
+    瀹氭椂澶勭悊绛夊緟鎵ц鐨勪换鍔� 宸ヤ綔鐘舵�佷负21.鐢熸垚鍑哄簱浠诲姟 涓旂洰鏍囧簱浣嶄腑涓嶅惈@瀛楃
+     */
+    //@Scheduled(cron = "0/10 * * * * ? ")
+    public void dealWatiWrk(){
+        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectReadyAgvWrkMast();
+        if(!Cools.isEmpty(agvWrkMastList)){
+            try {
+                ReturnT<String> returnT = agvWrkMastHandler.dealWatiWrk(agvWrkMastList);
+            } catch (IOException e) {
+                log.error(e.getMessage());
+            }
+        }
+    }
 }

--
Gitblit v1.9.1