From 1a0bdd8df58435ec37e9d8345e67cd092902b5e4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:27:18 +0800
Subject: [PATCH] 序号控制
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index b61a4aa..5af485f 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -5,7 +5,6 @@
import com.core.common.R;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
-import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
@@ -19,7 +18,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -70,20 +68,20 @@
* @author Ryan
* @date 2026/1/10 14:42
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
private void autoPubTasks() {
// 浠呭鐞嗗緟涓嬪彂/宸茬敓鎴愪笅鍙戝彿鐨勫伐浣滄。銆�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L))
+ .orderBy("user_no", true)
+ .orderBy("plt_type", true));
if (wrkMasts.isEmpty()) {
return;
}
- // 鎵撴暎椤哄簭锛岄伩鍏嶅浐瀹氭帓搴忎笅鍚屼竴鎵逛换鍔￠暱鏈熷崰鐢ㄨ皟搴︽満浼氥��
- Collections.shuffle(wrkMasts);
List<WorkTaskParams> paramsList = new ArrayList<>();
for (WrkMast wrkMast : wrkMasts) {
// 鍑哄簱绫讳换鍔★紙ioType > 100锛夐粯璁ら渶瑕� ERP 纭锛涙湭纭鐨勪换鍔″湪杩欓噷鐩存帴璺宠繃銆�
- if (wrkMast.getIoType()>100&& !wrkMast.getPdcType().equals("Y")) {
+ if (wrkMast.getIoType() > 100 && !"Y".equalsIgnoreCase(wrkMast.getPdcType())) {
continue;
}
@@ -103,7 +101,7 @@
.setBatchSeq(wrkMast.getPltType())
.setBarcode(wrkMast.getBarcode());
// 2: 鍏ュ簱銆傚叆搴撴帴鍙ｄ娇鐢� sourceStaNo + 鐩爣搴撲綅銆�
- }else if(wrkMast.getIoType()==2&& !Cools.isEmpty(wrkMast.getSourceStaNo())){
+ } else if (wrkMast.getIoType() == 2 && !Cools.isEmpty(wrkMast.getSourceStaNo())) {
params.setType("in")
.setTaskNo(wrkMast.getWrkNo()+"")
.setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()))
--
Gitblit v1.9.1