From 933595e29a852fc5a25ea395e16c6441e22cb2b4 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, 24 Nov 2025 12:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=A9=BA=E6=89=98=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/modules/api/entity/PushPalletDetailDto.java | 1 + .../controller/WcsIntegrationController.java | 1 + .../service/impl/WcsIntegrationServiceImpl.java | 7 ++++--- .../notify/service/impl/IssureNotifyServiceImpl.java | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) 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 786f815..c43ee67 100644 --- a/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java +++ b/src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java @@ -19,5 +19,6 @@ public class PushPalletDetailDto { private boolean endFlag; private List cargoInfos;//明细数据 private PartTypeEnum partType; + private Integer count=1;//托盘数量 默认为1 } diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/controller/WcsIntegrationController.java b/src/main/java/com/gaotao/modules/automatedWarehouse/controller/WcsIntegrationController.java index 0ef350b..2ebc919 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/controller/WcsIntegrationController.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/controller/WcsIntegrationController.java @@ -347,6 +347,7 @@ public class WcsIntegrationController { params.put("site", request.getSite()); params.put("palletId", request.getPalletId()); params.put("transportFlag", "Y"); // 默认入库并运输 - rqrq + params.put("count", 1); wcsIntegrationService.notifyEmptyPalletInbound(params); } 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 995d020..e9f444d 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 @@ -1815,6 +1815,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { String site = (String) params.get("site"); String palletId = (String) params.get("palletId"); String transportFlag = (String) params.get("transportFlag"); + Integer count= (Integer) params.get("count"); // 参数校验 - rqrq if (!StringUtils.hasText(site)) { @@ -1894,7 +1895,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { } } // 调用空托盘推送方法（只推送托盘数据，cargoInfos为null）- rqrq - pushEmptyPalletDetail(site, palletId, orderTask.getTaskNo(), orderTask.getItemNo()); + pushEmptyPalletDetail(site, palletId, orderTask.getTaskNo(), orderTask.getItemNo(),count); System.out.println("空托盘通知入库完成 - rqrq"); } @@ -2112,7 +2113,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { * @author rqrq * @date 2025/10/16 */ - private void pushEmptyPalletDetail(String site, String palletId, String taskNo, Integer itemNo) { + private void pushEmptyPalletDetail(String site, String palletId, String taskNo, Integer itemNo,Integer count) { System.out.println("开始推送空托盘数据到WCS - rqrq，palletId=" + palletId + ", taskNo=" + taskNo); // 获取栈板信息（包含pallet_type表关联数据）- rqrq @@ -2148,7 +2149,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { } else { inData.setPartType(PartTypeEnum.fromCode(3)); } - + inData.setCount(count); inData.setSite(site); inData.setTaskNo(taskNo); inData.setItemNo(itemNo); diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java index 76bd3e6..c5e6f2a 100644 --- a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java @@ -249,8 +249,7 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { throw new RuntimeException(e); } String productionArea; - // if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) { - if(data.getFgPartNo().contains("-")) { + if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) { productionArea = "Z112"; }else { productionArea = issureNotifyMapper.getProductAreaByPlanner(data.getSite(), rows.get(0).getPlannerBuyer());