From eb42d8c04b0eda4795d8e1909949bf820701ac7f Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期四, 19 六月 2025 13:32:10 +0800 Subject: [PATCH] 库位添加逻辑删除 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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 e962018..850bcbe 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 @@ -87,6 +87,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); @@ -110,7 +111,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())); } }); @@ -119,8 +120,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)) { @@ -237,6 +238,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