From 21357f1d42f995e11e99a12a5f225fe6442b9ad1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 13:05:09 +0800
Subject: [PATCH] 优化定时任务及日志输出，调整订单同步逻辑

---
 src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
index e9729f3..801e139 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveTwoAndThreeGoOneScheduler.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.common.R;
 import com.zy.asrs.entity.AgvBasDevp;
 import com.zy.asrs.entity.WrkMastExecute;
 import com.zy.asrs.service.AgvBasDevpService;
@@ -30,7 +31,7 @@
     /**
      * 鎵цagv_wrk_mast_execute浠诲姟
      */
-    @Scheduled(cron = "0/2 * * * * ? ")
+//    @Scheduled(cron = "0/2 * * * * ? ")
     private void autoMove(){
         List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",0L));
         for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
@@ -47,9 +48,9 @@
     /**
      * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
      */
-    @Scheduled(cron = "0/2 * * * * ? ")
+//    @Scheduled(cron = "0/2 * * * * ? ")
     private void autoMove2(){
-        List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L));
+        List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",3L));
         for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
             Date now = new Date();
             try{
@@ -75,6 +76,51 @@
         }
     }
 
+    /**
+     * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
+     */
+//    @Scheduled(cron = "0/2 * * * * ? ")
+    private void autoMove3(){
+        List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L));
+        for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
+            Date now = new Date();
+            try{
+                if (wrkMastExecute.getStatus()==2){
+                    AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()]));
+                    if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("S")){
+                        log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
+                    }else {
+                        wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+                        wrkMastExecute.setModiTime(now);
+                        wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+                        wrkMastExecuteService.updateById(wrkMastExecute);
+                        updateAgvBasDevp(agvBasDevp,"F",agvBasDevp.getLocType2(),agvBasDevp.getBarcode());
+                    }
+                }else if (wrkMastExecute.getStatus()==3 || wrkMastExecute.getStatus()==4){
+                    AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()]));
+                    if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("R")){
+                        log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
+                    }else {
+                        wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+                        wrkMastExecute.setModiTime(now);
+                        wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+                        wrkMastExecuteService.updateById(wrkMastExecute);
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"O","",(short)0);
+                    }
+                }else if (wrkMastExecute.getStatus()==1){
+                    wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
+                    wrkMastExecute.setModiTime(now);
+                    wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
+                    wrkMastExecuteService.updateById(wrkMastExecute);
+                }
+            }catch (Exception e){
+                log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+            }
+        }
+    }
+
+
+
     private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
         if(!Cools.isEmpty(agvBasDevp)){
             agvBasDevp.setLocSts(locSts);

--
Gitblit v1.9.1