From b6e0bec71de45cad64e9de14977770053be7e010 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 10 六月 2025 19:28:02 +0800
Subject: [PATCH] 流程更改

---
 src/main/java/com/zy/asrs/task/WorkLogScheduler.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 44c379e..a675ccd 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,38 +1,88 @@
 package com.zy.asrs.task;
 
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.WorkLogHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * Created by vincent on 2020/7/7
  */
+@Slf4j
 @Component
 public class WorkLogScheduler {
-
-    private static final Logger log = LoggerFactory.getLogger(WorkLogScheduler.class);
 
     @Autowired
     private WorkLogHandler workLogHandler;
     @Autowired
     private WrkMastService wrkMastService;
 
+    @Resource
+    private LocMastService locMastService;
+
     @Scheduled(cron = "0/3 * * * * ? ")
     private void execute(){
-        WrkMast wrkMast = wrkMastService.selectToBeHistoryData();
-        if (null == wrkMast) {
+        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
+        if (wrkMasts.isEmpty()) {
             return;
         }
-        ReturnT<String> result = workLogHandler.start(wrkMast);
-        if (!result.isSuccess()) {
-            log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+        for (WrkMast wrkMast : wrkMasts) {
+            ReturnT<String> result = workLogHandler.start(wrkMast);
+            if (!result.isSuccess()) {
+                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+            }
         }
     }
 
+// 鎻掑叆搴撲綅
+//    @Scheduled(cron = "0 43 * * * ?")
+//    private void execute1(){
+//        for(int i = 5; i<= 6; i++)
+//            for(int j = 41; j<= 56; j ++)
+//                for(int k = 1; k <= 11; k++){
+//                    LocMast locMast = new LocMast();
+//                    locMast.setLocNo("0"+i+"0"+j +""+(k <= 9 ? "0"+k:k));
+//                    locMast.setRow1(i);
+//                    locMast.setBay1(j);
+//                    locMast.setLev1(k);
+//                    locMast.setLocSts("O");
+//                    locMast.setCrnNo(2);
+//                    locMast.setWhsType(1L);
+//                    locMast.setLocType1((short)1);
+//                    locMast.setLocType2((short)1);
+//                    locMast.setLocType3((short)1);
+//                    locMast.setFullPlt("N");
+//                    locMastService.insert(locMast);
+//                }
+//        System.out.println("瀹屾垚---");
+//        for(int i = 7; i<= 8; i++)
+//            for(int j = 41; j<= 56; j ++)
+//                for(int k = 1; k <= 11; k++){
+//                    LocMast locMast = new LocMast();
+//                    locMast.setLocNo("0"+i+"0"+j +""+(k <= 9 ? "0"+k:k));
+//                    locMast.setRow1(i);
+//                    locMast.setBay1(j);
+//                    locMast.setLev1(k);
+//                    locMast.setLocSts("O");
+//                    locMast.setCrnNo(3);
+//                    locMast.setWhsType(1L);
+//                    locMast.setLocType1((short)1);
+//                    locMast.setLocType2((short)1);
+//                    locMast.setLocType3((short)1);
+//                    locMast.setFullPlt("N");
+//                    locMastService.insert(locMast);
+//                }
+//        System.out.println("瀹屾垚--瀹屾垚-");
+//
+//    }
+
+
 }

--
Gitblit v1.9.1