From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
index ae73b41..73b17c8 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
@@ -3,6 +3,7 @@
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.AutomaticallyIssueWCSTasksHandler;
import com.zy.asrs.task.handler.WorkMastHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,24 +20,18 @@
@Autowired
private WrkMastService wrkMastService;
@Autowired
- private WorkMastHandler workMastHandler;
+ private AutomaticallyIssueWCSTasksHandler automaticallyIssueWCSTasksHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
+ List<WrkMast> wrkMasts = wrkMastService.selectList(
+ new com.baomidou.mybatisplus.mapper.EntityWrapper<WrkMast>()
+ .eq("wrk_sts", 11)
+ .last(" and (pause_mk is null or pause_mk <> 'Y') and (io_type not in (101,103,104,107,110) or Pdc_type = 'Y')")
+ );
if (wrkMasts.isEmpty()) {
return;
}
- for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> returnT = workMastHandler.start(wrkMast);
- if (!returnT.isSuccess()) {
- wrkMast.setUpdMk("X");
- wrkMast.setErrorMemo(returnT.getMsg());
- wrkMast.setErrorTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
+ ReturnT<String> returnT = automaticallyIssueWCSTasksHandler.start(wrkMasts);
}
}
--
Gitblit v1.9.1