From 3d61ab52a458045d499a8ad62ed9033a64be8792 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 17 六月 2025 18:24:22 +0800
Subject: [PATCH] 库位添加逻辑删除
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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 66de319..66a3b84 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
@@ -64,11 +64,11 @@
tasks.forEach(task -> {
try {
ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
- conveyorStarParam.setSlotCode(task.getOriginLoc())
+ conveyorStarParam.setSlotCode(task.getOriginSite())
.setContainerCode(task.getBarcode())
.setDirection("100");
// 鍘熷鎶ユ枃
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));
+ log.info("閫氱煡ESS杈撻�佺嚎娴佸姩璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);
@@ -86,7 +86,6 @@
taskService.update(new LambdaUpdateWrapper<Task>()
.eq(Task::getId, task.getId())
.set(Task::getTaskSts, TaskStsType.WCS_CONVEYOR_START.id));
- log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
} else {
throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
}
@@ -95,7 +94,7 @@
log.error(ex.getMessage());
} finally {
//濡傛灉寮傚父淇敼绂佺敤鐘舵��
- taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));
+ // taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));
}
});
@@ -139,9 +138,6 @@
describe.setContainerCode(task.getBarcode())
.setToLocationCode(formatLocNo)
.setToStationCode(task.getTargetSite());
-// .setFromLocationCode("")
-// .setContainerFace("")
-// .setContainerType("").setStorageTag("");
param.setTaskDescribe(describe);
params.add(param);
@@ -150,11 +146,7 @@
tasksParam.setTaskType("putaway");
// TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
- //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
-// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- // 璁剧疆璇锋眰鍙傛暟
-// params.add("params", tasksParam);
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));
+ log.info("涓嬪彂鍏ュ簱浠诲姟璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
@@ -166,7 +158,6 @@
} else {
ObjectMapper objectMapper = new ObjectMapper();
CommonReponse reponse = objectMapper.readValue(exchange.getBody(), CommonReponse.class);
-// CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
if (reponse.getCode() == 0) {
// 璇锋眰鎴愬姛鍚庯紝缁熶竴淇敼鎵�鏈変换鍔℃。鐘舵�佷负鍏ュ簱鎵ц涓��
tasks.forEach(task -> {
@@ -258,14 +249,14 @@
if (tasks.isEmpty()) {
return;
}
- tasks.stream().sorted(Comparator.comparing(Task::getTaskSts))
- .collect(Collectors.toList());
+// tasks.stream().sorted(Comparator.comparing(Task::getTaskSts))
+// .collect(Collectors.toList());
// 鏁版嵁缁勮
PublishTasksParam tasksParam = new PublishTasksParam();
+ List<TaskParam> params = new ArrayList<>();
//TODO 纭鏄惁闇�瑕佸崟浠诲姟澶氬鍣ㄧ爜鐨勯渶姹傦紝鐩墠绯荤粺閮芥槸鍗曞鍣ㄧ爜鐢熸垚鍗曚换鍔★紝澶氫换鍔℃槑缁嗭紙鐗╂枡娣疯锛�
tasks.forEach(task -> {
- List<TaskParam> params = new ArrayList<>();
TaskParam param = new TaskParam();
//璁剧疆瀹瑰櫒缂栫爜
param.setTaskCode(task.getTaskNo());
@@ -276,17 +267,16 @@
.setToStationCode(task.getTargetSite());
param.setTaskDescribe(describe);
params.add(param);
- tasksParam.setTasks(params);
});
-
+ tasksParam.setTasks(params);
tasksParam.setTaskType("carry");
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", properties.getBaseHost() + properties.getEssReceiveTask(), JSONObject.toJSONString(tasksParam));
+ log.info("鍑哄簱浠诲姟涓嬪彂璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", properties.getBaseHost() + properties.getEssReceiveTask(), JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
// 璇锋眰
ResponseEntity<String> exchange = restTemplate.exchange(properties.getBaseHost() + properties.getEssReceiveTask(), HttpMethod.POST, httpEntity, String.class);
- log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
+ log.info("鍑哄簱浠诲姟涓嬪彂 杩斿洖缁撴灉锛歿}", exchange);
if (exchange.getBody() == null) {
throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
} else {
--
Gitblit v1.9.1