From e3b373fa8ac5ee53d30fd4b9435ea31ecda9c82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Sat, 7 Mar 2026 18:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=92=E7=9B=B8=E5=BE=AA=E7=8E=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logistics/controller/OrderBoxController.java | 9 +++++++++ .../desk/logistics/service/IOrderBoxService.java | 1 + .../service/impl/IOrderBoxServiceImpl.java | 16 ++++++++++++++++ .../impl/TaskExecuteRecordServiceImpl.java | 4 +++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java index 5a8b29f5..0efae96b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java @@ -131,5 +131,14 @@ public class OrderBoxController extends BladeController { public R inventoryReturnToWarehouseList(){ return iOrderBoxService.returnToWarehouseList(); } + /** + * 回调作业中心list + */ + @GetMapping("/receive") + @ApiOperationSupport(order = 7) + @Operation(summary = "接收", description = "接收释放站点") + public R receive(@RequestParam String stationCode){ + return iOrderBoxService.receive(stationCode); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java index 4d0770a7..2515fe53 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java @@ -51,4 +51,5 @@ public interface IOrderBoxService { R getBSWORKCENTER(); + R receive(String stationCode); } \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index a75c59a2..5982708d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -437,6 +437,22 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { return null; } + @Override + public R receive(String stationCode) { + if (stationCode.isEmpty()) { + return R.fail("站点编码不能为空"); + } + List stationList = iStationService.list(new LambdaQueryWrapper().eq(Station::getStationCode, stationCode)); + if (stationList.isEmpty()) { + return R.fail("站点编码不存在"); + } + stationList.get(0).setStationStatus(STATUS_FREE); + if (iStationService.updateById(stationList.get(0))) { + return R.success(); + } + return R.fail("站点切换空闲异常"); + } + /** * 批量保存订单与任务的绑定关系 * 核心:创建订单绑定记录并批量插入,插入失败则回滚任务(删除已创建的任务) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java index 866be5b7..b7ee3bb5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java @@ -156,11 +156,13 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl requestBody = new HashMap<>(); requestBody.put("reqCode", "TEXT" + IdUtil.fastSimpleUUID()); requestBody.put("podCode", virtualShelvesCode); - requestBody.put("berthCode", stationCode); + requestBody.put("positionCode", stationCode); requestBody.put("podDir", "0"); requestBody.put("indBind", "1"); try { + log.info("绑定虚拟参数:{}", requestBody); + log.info("绑定虚拟url地址:{}", url); String responseStr = HttpUtil.post(url, JSON.toJSONString(requestBody)); log.info("绑定虚拟货架响应:{}", responseStr);