From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index e0bb399..f0174de 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -76,7 +76,8 @@
@Transactional(rollbackFor = Exception.class)
public void conveyorStart() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id).eq(Task::getStatus, 1));
+ .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
+ .eq(Task::getStatus, 1));
tasks.forEach(task -> {
try {
ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
@@ -87,6 +88,7 @@
log.info("閫氱煡ESS杈撻�佺嚎娴佸姩璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);
// 璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/conveyor/moveContainer", HttpMethod.POST, httpEntity, String.class);
@@ -108,9 +110,6 @@
}
} catch (Exception ex) {
log.error(ex.getMessage());
- } finally {
- //濡傛灉寮傚父淇敼绂佺敤鐘舵��
- // taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));
}
});
@@ -119,8 +118,8 @@
/**
* 鐢熸垚鑷姩鐩樼偣浠诲姟
*/
- @Scheduled(cron = "0/50 * * * * ?")
- @Transactional(rollbackFor = Exception.class)
+// @Scheduled(cron = "0/50 * * * * ?")
+// @Transactional(rollbackFor = Exception.class)
public void genCheckTask() {
Loc locs = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.F.val()).orderByAsc(Loc::getLocNo).last("limit 1"));
if (Objects.isNull(locs)) {
@@ -188,7 +187,6 @@
}
}
-
/***
* 鍏ュ簱浠诲姟---涓嬪彂鍏ュ簱浠诲姟
* 姣忛殧3绉掞紝鍒锋柊褰撳墠閫氱煡妗ｅ垪琛紝涓嬪彂寰呭叆搴撹鍗曡嚦ESS
@@ -237,6 +235,7 @@
log.info("涓嬪彂鍏ュ簱浠诲姟璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
// 璇锋眰
ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/task/create", HttpMethod.POST, httpEntity, String.class);
--
Gitblit v1.9.1