From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index e6c0905..0012067 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -6,6 +6,7 @@
import com.zy.asrs.common.utils.HttpHandler;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.LocStsType;
+import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.rcs.News;
@@ -35,6 +36,35 @@
private LocService locService;
@Autowired
private DictService dictService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
+
+ @Scheduled(cron = "0/1 * * * * ? ")
+ @Transactional
+ public synchronized void clearCompletedTask2() {
+ ArrayList<Long> taskSts = new ArrayList<>();
+// taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
+// taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts);
+ taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
+ taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
+ taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
+
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getStatus, 1)
+ .in(Task::getTaskSts, taskSts));
+ for (Task task : tasks) {
+
+// boolean httpRequest = doHttpRequest(task, "127.0.0.1:8080", "/wms/open/asrs//wrkMast/finish/v1");
+// if (!httpRequest) {
+// return;
+// }
+
+ //璁板綍搴撳瓨淇℃伅
+ updateRecordLoc(task);
+ //浠诲姟杞巻鍙叉。
+ saveTaskLog(task);
+ }
+ }
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
@@ -42,9 +72,10 @@
ArrayList<Long> taskSts = new ArrayList<>();
taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts);
- taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
- taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
- taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
+// taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
+// taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
+// taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
+ taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);
Dict reportWms = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "reportWms"));
@@ -52,6 +83,13 @@
.eq(Task::getStatus, 1)
.in(Task::getTaskSts, taskSts));
for (Task task : tasks) {
+ Motion motion = motionService.getOne(new LambdaQueryWrapper<Motion>().eq(Motion::getMotionCtg, MotionCtgType.LIFT_WITH_GOODS.val()).eq(Motion::getTaskNo, task.getTaskNo()));
+ if (motion != null) {
+ List<BasConveyorSta> conveyorStas = basConveyorStaService.list(new LambdaQueryWrapper<BasConveyorSta>().in(BasConveyorSta::getTaskNo, motion.getTemp()));
+ if (!conveyorStas.isEmpty()) {
+ continue;
+ }
+ }
if (reportWms != null && reportWms.getValue().equals("true")) {
//鑾峰彇WMS鍦板潃
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "WMS_URL").eq(Dict::getStatus, 1));
@@ -61,8 +99,10 @@
}
String wmsUrl = dict.getValue();
- if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts) || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)){
- boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs//wrkMast/finish/v1");
+ if(task.getTaskSts().equals(TaskStsType.COMPLETE_INBOUND.sts)
+ || task.getTaskSts().equals(TaskStsType.COMPLETE_OUTBOUND.sts)
+ || task.getTaskSts().equals(TaskStsType.COMPLETE_LADEN_MOVE.sts)){
+ boolean httpRequest = doHttpRequest(task, wmsUrl, "/open/asrs/wrkMast/finish/v1");
if (!httpRequest) {
continue;
}
--
Gitblit v1.9.1