From b41fe423d1a21e4b8f995d8eba98700dcb08e966 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 07 三月 2025 10:11:39 +0800
Subject: [PATCH] bug修改
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 89 +++++++++++++++++++++++---------------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java | 3 +
2 files changed, 49 insertions(+), 43 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 8ff46a3..7ea4d15 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
@@ -107,56 +107,59 @@
.eq(Task::getTaskSts, TaskStsType.GENERATE_IN.id))
.stream().sorted(Comparator.comparing(Task::getTaskSts))
.collect(Collectors.toList());
+ if (tasks.size() == 0) {
+ return;
+ }
// 鏁版嵁缁勮
-// PublishTasksParam tasksParam = new PublishTasksParam();
-// //TODO 纭鏄惁闇�瑕佸崟浠诲姟澶氬鍣ㄧ爜鐨勯渶姹傦紝鐩墠绯荤粺閮芥槸鍗曞鍣ㄧ爜鐢熸垚鍗曚换鍔★紝澶氫换鍔℃槑缁嗭紙鐗╂枡娣疯锛�
-// tasks.forEach(task -> {
-// List<TaskParam> params = new ArrayList<>();
-// TaskParam param = new TaskParam();
-// //璁剧疆瀹瑰櫒缂栫爜
-// param.setTaskCode(task.getTaskNo());
-// List<TaskDescribe> taskDescribes = new ArrayList<>();
-// TaskDescribe describe = new TaskDescribe();
-// //璁剧疆鐩爣搴撲綅锛岀珯鐐�
-// describe.setContainerCode(task.getBarcode())
-// .setToLocationCode(task.getTargetLoc())
-// .setToStationCode(task.getTargetSite());
-// taskDescribes.add(describe);
-// param.setTaskDescribe(taskDescribes);
-// params.add(param);
-// tasksParam.setTasks(params);
-// });
-//
-// tasksParam.setTaskType("putaway");
-// // TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
-// //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
-// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-// // 璁剧疆璇锋眰鍙傛暟
-// params.add("params", JSONObject.toJSONString(tasksParam));
-// log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", Constant.ISSUE_TASK_OF_EVENT, JSONObject.toJSONString(tasksParam));
-// HttpHeaders headers = new HttpHeaders();
-// headers.add("Content-Type", "application/json");
-// HttpEntity httpEntity = new HttpEntity<>(params, headers);
-// // 璇锋眰
-// ResponseEntity<String> exchange = restTemplate.exchange(Constant.ISSUE_TASK_OF_EVENT, HttpMethod.POST, httpEntity, String.class);
-// log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
-// if (exchange.getBody() == null) {
-// throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
-// } else {
-// CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
-// if (reponse.getCode() == 0) {
- //璇锋眰鎴愬姛鍚庯紝缁熶竴淇敼鎵�鏈変换鍔℃。鐘舵�佷负鍏ュ簱鎵ц涓��
+ PublishTasksParam tasksParam = new PublishTasksParam();
+ //TODO 纭鏄惁闇�瑕佸崟浠诲姟澶氬鍣ㄧ爜鐨勯渶姹傦紝鐩墠绯荤粺閮芥槸鍗曞鍣ㄧ爜鐢熸垚鍗曚换鍔★紝澶氫换鍔℃槑缁嗭紙鐗╂枡娣疯锛�
+ tasks.forEach(task -> {
+ List<TaskParam> params = new ArrayList<>();
+ TaskParam param = new TaskParam();
+ //璁剧疆瀹瑰櫒缂栫爜
+ param.setTaskCode(task.getTaskNo());
+ List<TaskDescribe> taskDescribes = new ArrayList<>();
+ TaskDescribe describe = new TaskDescribe();
+ //璁剧疆鐩爣搴撲綅锛岀珯鐐�
+ describe.setContainerCode(task.getBarcode())
+ .setToLocationCode(task.getTargetLoc())
+ .setToStationCode(task.getTargetSite());
+ taskDescribes.add(describe);
+ param.setTaskDescribe(taskDescribes);
+ params.add(param);
+ tasksParam.setTasks(params);
+ });
+
+ tasksParam.setTaskType("putaway");
+ // TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
+ //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ // 璁剧疆璇锋眰鍙傛暟
+ params.add("params", 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<>(params, headers);
+ // 璇锋眰
+ ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/task/create", HttpMethod.POST, httpEntity, String.class);
+ log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
+ if (exchange.getBody() == null) {
+ throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
+ } else {
+ CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
+ if (reponse.getCode() == 0) {
+ // 璇锋眰鎴愬姛鍚庯紝缁熶竴淇敼鎵�鏈変换鍔℃。鐘舵�佷负鍏ュ簱鎵ц涓��
tasks.forEach(task -> {
taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getTaskSts, TaskStsType.WCS_EXECUTE_IN.id)
.eq(Task::getBarcode, task.getBarcode()));
});
-// } else {
-// // TODO 璇锋眰澶辫触闇�纭鏄惁瀛樺湪閮ㄥ垎鎴愬姛鐨勬儏鍐碉紝閮ㄥ垎鎴愬姛闇�瑕佸崟鐙埛鏂版垚鍔熺殑浠诲姟妗ｇ姸鎬�
-// throw new CoolException(reponse.getMsg());
-// }
-// }
+ } else {
+ // TODO 璇锋眰澶辫触闇�纭鏄惁瀛樺湪閮ㄥ垎鎴愬姛鐨勬儏鍐碉紝閮ㄥ垎鎴愬姛闇�瑕佸崟鐙埛鏂版垚鍔熺殑浠诲姟妗ｇ姸鎬�
+ throw new CoolException(reponse.getMsg());
+ }
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
index 39d8811..7a0bb7d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocMapController.java
@@ -112,6 +112,9 @@
@GetMapping("/locMap/getData/{lev}/auth")
public R getMapData(@PathVariable("lev") Integer lev) {
LocMap locMap = locMapService.getOne(new LambdaQueryWrapper<LocMap>().eq(LocMap::getMapLev, lev));
+ if (locMap == null) {
+ return R.ok();
+ }
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(locMap.getData(), ArrayList.class);
--
Gitblit v1.9.1