From f9d1c0fda4c154a1d4baab4a7b68f20510a04465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Mon, 20 Oct 2025 13:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=88=E6=9D=BF=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=A2=91=E7=8E=87=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8F=96=E8=B5=B0=E6=A0=88=E6=9D=BF=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/PalletWareHouseData.java | 2 +- .../service/impl/WmsMessageServiceImpl.java | 18 +++++++++++++++++- .../task/WcsTaskScheduler.java | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java b/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java index e5318ac..37c5514 100644 --- a/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java +++ b/src/main/java/com/gaotao/modules/api/entity/PalletWareHouseData.java @@ -9,7 +9,7 @@ public class PalletWareHouseData { private String palletId;//栈板ID private String taskNo; private Integer itemNo; - private String transTypeDesc;//立库出入库类型:出库 入库 取货通知 + private String transTypeDesc;//立库出入库类型:出库 入库 取货通知 取走栈板 // private String toWareHouseId;//入库需要告知 仓库编码 private String toBarcode ;//入库需要告知 库位编码 } diff --git a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java index 679c9fc..f715df6 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/WmsMessageServiceImpl.java @@ -345,6 +345,22 @@ public class WmsMessageServiceImpl implements WmsMessageService { } toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue(); toLocationId = BufferZoneConfig.BUFFER_LOCATION_ID.getValue(); + }else if ("取走栈板".equals(inData.getTransTypeDesc())) { + // 出库时从缓冲区配置获取 + switch (inData.getToBarcode()) { + case "1099": + inData.setToBarcode("D1"); + break; + case "1093": + inData.setToBarcode("D2"); + break; + } + if(!inData.getToBarcode().startsWith("D")){ + throw new RuntimeException("目前只有滚筒对接区(D1/D2)可以执行这个操作!"); + } + toWarehouseId = BufferZoneConfig.BUFFER_WAREHOUSE_ID.getValue(); + toLocationId = inData.getToBarcode(); + wcsIntegrationMapper.updateAgvStationStatus(inData.getToBarcode(), 0, "空闲"); } else { throw new RuntimeException("不支持的事务类型：" + inData.getTransTypeDesc()); } @@ -382,7 +398,7 @@ public class WmsMessageServiceImpl implements WmsMessageService { // 保存到WCS回调任务表 wcsIntegrationMapper.insertWcsCallbackTask(callbackTask); - }else { + }else if ("入库".equals(inData.getTransTypeDesc())||"出库".equals(inData.getTransTypeDesc())) { // 4. 保存WCS回调数据到新表，等待定时任务处理 WcsCallbackTask callbackTask = new WcsCallbackTask(); callbackTask.setSite(inData.getSite()); diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java index aa5364a..ae059d5 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java @@ -45,7 +45,7 @@ public class WcsTaskScheduler { * cron表达式：0 * * * * ? 表示每分钟的第0秒执行 * 配置说明：通过 scheduler.wcs.enabled 控制是否启用 */ - @Scheduled(cron = "0 * * * * ?") + @Scheduled(cron = "0/10 * * * * ?") public void scheduleWcsTaskProcessing() { // 检查定时任务开关 if (!enabled) {