From a84386f98cc752516d492222684d5c850c9c7a1e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 00:00:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs
---
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 06a0624..9aa1fdb 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,6 +1,7 @@
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;
@@ -9,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -23,8 +25,11 @@
@Autowired
private WrkMastService wrkMastService;
+ @Resource
+ private LocMastService locMastService;
+
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ public void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
if (wrkMasts.isEmpty()) {
return;
@@ -37,4 +42,47 @@
}
}
+// 鎻掑叆搴撲綅
+// @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