From 6de5d93c41f03d477f805f35d14a98f267430d6e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 24 十月 2024 16:13:13 +0800
Subject: [PATCH] 备货区按层列排放

---
 src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
index c3f00db..cb769d5 100644
--- a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
@@ -1,29 +1,45 @@
 package com.zy.asrs.task;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.WrkMastStaService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.OneLouHangJiaHandler;
-import com.zy.asrs.task.handler.RailwayPlatformHandler;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
  * Created by Monkey D. Luffy on 2023.09.17
  * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............閫�搴撴媶鐮佸灈
  */
+@Slf4j
 @Component
 public class OneLouHangJiaScheduler {
 
     @Autowired
     private OneLouHangJiaHandler oneLouHangJiaHandler;
+    @Autowired
+    private WrkMastStaService wrkMastStaService;
 
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){//閫�搴撴媶鐮佸灈
-        int[] staNos =new int[]{147};
+//        int[] staNos =new int[]{118,119};
+        int[] staNos =new int[]{118};
         for (int staNo : staNos){
-            ReturnT<String> result = oneLouHangJiaHandler.start(staNo);
-            if (result.getCode()==200){
-                break;
+            try{
+                WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("sta_end",staNo)
+                        .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
+                if (!Cools.isEmpty(wrkMastSta)){
+                    break;
+                }
+                ReturnT<String> result = oneLouHangJiaHandler.start(147,staNo);
+                if (result.getCode()==200){
+                    break;
+                }
+            }catch (Exception e){
+                log.error("閫�搴撴媶鐮佸灈"+staNo+"绔欑偣澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
             }
         }
     }

--
Gitblit v1.9.1