From 74214e18c9aecab2cbb9003e08bed66b3bd1f092 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: Sat, 4 Oct 2025 15:12:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B9=9D=E5=AE=AB=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/modules/api/entity/PalletStationVo.java | 2 +- .../modules/api/entity/PushPalletDetailDto.java | 10 +++++++++- .../modules/api/service/impl/WcsApiServiceImpl.java | 1 + .../service/impl/WcsIntegrationServiceImpl.java | 11 +++++++++++ .../service/impl/WcsTaskServiceImpl.java | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/api/entity/PalletStationVo.java b/src/main/java/com/gaotao/modules/api/entity/PalletStationVo.java index 4687b502..1a1c559f 100644 --- a/src/main/java/com/gaotao/modules/api/entity/PalletStationVo.java +++ b/src/main/java/com/gaotao/modules/api/entity/PalletStationVo.java @@ -7,6 +7,6 @@ import java.util.List; @Data public class PalletStationVo { private Integer position; //点位 - private Integer layer; //层数 + private Integer layer; //层数 List productInfos;//明细 } diff --git a/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java b/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java index d62eb0c6..fb0b14ef 100644 --- a/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java +++ b/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java @@ -17,7 +17,7 @@ public class PushPalletDetailDto { private Integer soreType;//分拣方式 0人工 1气胀轴 2抱箱 private String assemblyPosition;//托盘码 private List cargoInfos;//明细数据 - + private PartTypeEnum partType; public String getSite() { return site; } @@ -105,4 +105,12 @@ public class PushPalletDetailDto { public void setCargoInfos(List cargoInfos) { this.cargoInfos = cargoInfos; } + + public PartTypeEnum getPartType() { + return partType; + } + + public void setPartType(PartTypeEnum partType) { + this.partType = partType; + } } diff --git a/src/main/java/com/gaotao/modules/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/WcsApiServiceImpl.java index 8b155ef0..3a76b2b1 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/WcsApiServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/WcsApiServiceImpl.java @@ -149,6 +149,7 @@ public class WcsApiServiceImpl implements WcsApiService { // 3. 构造请求参数 Map request = Map.of("taskNo", inData.getTaskNo(), + "itemNo", inData.getItemNo(), "palletId", inData.getPalletId()); Long logId = null; diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java index 9ae65ddb..4f91f975 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java @@ -838,6 +838,8 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { String autoSort = palletInfo.getAutoSort(); boolean isAutoSort = "Y".equals(autoSort); + + //获取栈板里面增量数据 List newDetail=wcsIntegrationMapper.getPalletDetailsNewDetail(site, palletId); if(newDetail.isEmpty()){ @@ -847,6 +849,15 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { boolean hasCommonlyUsed = newDetail.stream() .anyMatch(pallet -> "Y".equals(pallet.getIsCommonlyUsed())); PushPalletDetailDto inData= new PushPalletDetailDto(); + if("A01".equals(palletInfo.getPalletFamily())){ + inData.setPartType(PartTypeEnum.fromCode(2)); + }else if("A02".equals(palletInfo.getPalletFamily())){ + inData.setPartType(PartTypeEnum.fromCode(1)); + }else if("A03".equals(palletInfo.getPalletFamily())){ + inData.setPartType(PartTypeEnum.fromCode(0)); + }else{ + inData.setPartType(PartTypeEnum.fromCode(3)); + } inData.setSite(site); inData.setTaskNo(taskNo); inData.setItemNo(itemNo); diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java index db5f72f1..2f8d71b8 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java @@ -160,7 +160,7 @@ public class WcsTaskServiceImpl implements WcsTaskService { log.info("立库调栈板任务处理成功：taskNo={}, result={}", orderTask.getTaskNo(), result); // 4. 更新任务状态为已完成 - wcsIntegrationMapper.updateOrderTaskStatusAndWmsStatus(orderTask.getId(), "已完成", "WCS调用成功"); + wcsIntegrationMapper.updateOrderTaskStatusAndWmsStatus(orderTask.getId(), "已下达", "WCS调用成功"); } catch (Exception e) { log.error("处理立库调栈板任务失败：taskNo={}, error={}", orderTask.getTaskNo(), e.getMessage());