From 4f45f8f3ec334a73ba24fc5d16017b5c044168aa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期五, 13 三月 2026 11:24:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 9a9065f..d0a61ca 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,15 +1,24 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+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;
import com.zy.asrs.task.handler.WorkMastHandler;
+import com.zy.asrs.utils.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -22,36 +31,11 @@
private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
@Autowired
+ private WcsApiService wcsApiService;
+ @Autowired
private WrkMastService wrkMastService;
@Autowired
private WorkMastHandler workMastHandler;
-
- /**
- * wcs涓婃姤浠诲姟瀹屾垚鍚庯紝灏嗕换鍔′笂鎶ョ粰erp
- * 2.鍏ュ簱涓婃姤
- * 13.鍑哄簱涓婃姤
- */
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute1(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(
- new com.baomidou.mybatisplus.mapper.EntityWrapper<WrkMast>()
- .in("wrk_sts", 2, 13)
- );
- if (wrkMasts.isEmpty()) {
- return;
- }
- for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> returnT = workMastHandler.start1(wrkMast);
- if (!returnT.isSuccess()) {
- wrkMast.setUpdMk("X");
- wrkMast.setErrorMemo(returnT.getMsg());
- wrkMast.setErrorTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -72,4 +56,55 @@
}
}
+ /**
+ * 浠诲姟鑷姩涓嬪彂
+ *
+ * @author Ryan
+ * @date 2026/1/10 14:42
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void autoPubTasks() {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ Collections.shuffle(wrkMasts);
+ for (WrkMast wrkMast : wrkMasts) {
+ if (wrkMast.getIoType()>100&& !wrkMast.getPdcType().equals("Y")) {
+ continue;
+ }
+ String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
+ String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
+ WorkTaskParams params = new WorkTaskParams();
+ //鍑哄簱鍜岀Щ搴�
+ if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getStaNo())&& !wrkMast.getStaNo().equals("0")) {
+ params.setType("out")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setLocNo(wcsSourceLocNo)
+ .setStaNo(String.valueOf(wrkMast.getStaNo()))
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBatch(1)
+ .setBatchSeq(wrkMast.getPltType())
+ .setBarcode(wrkMast.getBarcode());
+ }else if(wrkMast.getIoType()==2&& !Cools.isEmpty(wrkMast.getSourceStaNo())){
+ params.setType("in")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setSourceStaNo(String.valueOf(wrkMast.getSourceStaNo()))
+ .setLocNo(wcsLocNo)
+ .setTaskPri(wrkMast.getIoPri().intValue())
+ .setBarcode(wrkMast.getBarcode());
+ } else {
+ params.setType("move")
+ .setTaskNo(wrkMast.getWrkNo()+"")
+ .setSourceLocNo(wcsSourceLocNo)
+ .setLocNo(wcsLocNo)
+ .setBarcode(wrkMast.getBarcode());
+ }
+ R r = wcsApiService.pubWrkToWcs(params);
+ if (r.get("code").equals(200)){
+ break;
+ }
+ };
+ }
+
}
--
Gitblit v1.9.1