From e6cf7f032bee1cef9c49258746da44d66ca85c6c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 17 九月 2025 14:56:59 +0800
Subject: [PATCH] 添加仓库类型 单据添加上报完成类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
index 6e6344e..252a556 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -60,7 +60,7 @@
* 鑷姩鐢熸垚搴撲綅鏄庣粏
*/
@Transactional(rollbackFor = Exception.class)
-// @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/25 * * * * ?")
public void insertRandomMats() {
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type));
for (Loc loc : list) {
@@ -103,7 +103,7 @@
* @description: 鑷姩瀹屾垚鐩樼偣鍔熻兘
* @version 1.0
*/
- @Scheduled(cron = "0/35 * * * * ?")
+ @Scheduled(cron = "0/25 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void autoCheckComplete() {
//鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
@@ -146,16 +146,24 @@
* @description: 鑷姩鐢熸垚浠诲姟
* @version 1.0
*/
- @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/15 * * * * ?")
public void genRun() {
Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
if (!Boolean.parseBoolean(config.getVal())) {
return;
}
+
+ Integer maxThread = 30;
+ Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
+ if (!Objects.isNull(confNum)) {
+ maxThread = Integer.valueOf(confNum.getVal());
+ }
+
+
//鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type)));
- if (tasks.size() >= 6) {
+ if (tasks.size() >= maxThread) {
return;
}
String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);
@@ -210,7 +218,7 @@
}
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.in(DeviceSite::getSite, stationNames)
- .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type), false);
+ .eq(DeviceSite::getType, TaskType.TASK_TYPE_CHECK_OUT.type).last("limit 1"));
if (Cools.isEmpty(deviceSite)) {
throw new CoolException("鏃犲彲鐢ㄨ矾寰勶紒锛�");
}
@@ -238,7 +246,7 @@
// // 鍑哄簱,闇�瑕佹牎楠屽伐浣滄。鏄惁瀛樺湪锛屽瓨鍦ㄥ氨璇存槑绔欑偣澶勪簬蹇欑鐘舵��
// this.runLocToSta(locGroupList, staGroupList, staTaskMemo);
-// // 绉诲簱
+// // 绉诲簱locGroupList
// this.runLocToLoc(locGroupList, staTaskMemo);
}
@@ -265,14 +273,62 @@
}
+ /**
+ * 鐢熸垚绉诲簱浠诲姟
+ * @param
+ * @param
+ */
// 绉诲簱
- private void runLocToLoc(List<Integer> locGroupList, String staTaskMemo) {
+ @Scheduled(cron = "0/23 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void runLocToLoc() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
+ if (!Boolean.parseBoolean(config.getVal())) {
+ return;
+ }
+ Integer maxThread = 50;
+ Config confNum = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_MOVE_THEAD_MAX));
+ if (!Objects.isNull(confNum)) {
+ maxThread = Integer.valueOf(confNum.getVal());
+ }
+
+ List<Integer> locGroupList = new ArrayList<>();
+ //鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskType, TaskType.TASK_TYPE_LOC_MOVE.type));
+ if (!tasks.isEmpty() && tasks.size() >= maxThread) {
+ return;
+ }
+ String autoRunArea = configService.getVal("AUTO_RUN_AREA", String.class);
+ if (Cools.isEmpty(autoRunArea)) {
+ return;
+ }
+ for (char c : autoRunArea.toCharArray()) {
+ switch (c) {
+ case '1':
+ locGroupList = LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST;
+ break;
+ case '2':
+ locGroupList = LocGroupConstant.RIGHT_LOC_ROW_LIST;
+ break;
+ case '3':
+ locGroupList = LocGroupConstant.MIDDLE_LOC_ROW_LIST;
+ break;
+ case '4':
+ locGroupList = LocGroupConstant.LEFT_LOC_ROW_LIST;
+ break;
+ case '5':
+ locGroupList = LocGroupConstant.FAR_LEFT_LOC_ROW_LIST;
+ break;
+ default:
+ break;
+ }
+ }
+
Integer startRow = Collections.min(locGroupList);
Integer endRow = Collections.max(locGroupList);
String memo = "DEMO_LOC_" + startRow + "-" + endRow;
-
-
// STOCK
LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type);
if (null != startRow) {
--
Gitblit v1.9.1