From 57f87baf858493ff6c4cf07e7efcf8571e6ddbc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 20 Aug 2026 15:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandoverTaskOrderApplicationService.java | 2 +- .../persistence/HandoverTaskOrderImpl.java | 9 +++- .../repository/todo/HandoverTaskOrderDO.java | 2 +- .../HandoverTaskOrderDomainService.java | 38 ++++++++++---- .../service/StockOutOrderDomainService.java | 4 +- .../HandoverTaskOrderDTO.java | 52 +++++++++---------- 6 files changed, 67 insertions(+), 40 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java index 98363eecb..ffb191f0c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java @@ -294,7 +294,7 @@ public class HandoverTaskOrderApplicationService { .collect(Collectors.toList()); if (!handoverTaskOrderIds.isEmpty()) { HandoverTaskOrderDO completeDO = new HandoverTaskOrderDO(); - completeDO.setHandoverTaskOrderIds(handoverTaskOrderIds); + completeDO.setHandoverTaskOrderIds(handoverTaskOrderIds.stream().map(String::valueOf).collect(Collectors.toList())); completeDO.setBillingJson(handoverTaskOrderDO.getBillingJson()); handoverTaskOrderDomainService.completeHandover(completeDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java index 58b9e34fe..d14bc4988 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/persistence/HandoverTaskOrderImpl.java @@ -112,7 +112,14 @@ public class HandoverTaskOrderImpl extends ServiceImpl handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIds = null; + if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { + handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() + .filter(str -> str != null && !str.trim().isEmpty()) + .map(Long::valueOf) + .collect(Collectors.toList()); + } if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { return false; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java index 50db1db68..ddc6af7d6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java @@ -130,7 +130,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity { private Long permissionMenuId; @ApiModelProperty("交接作业单id") - private List handoverTaskOrderIds; + private List handoverTaskOrderIds; @ApiModelProperty("交接作业单id") private List handoverTaskOrderIdsStr; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 9eb78b080..a5aebdbc3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -61,6 +61,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -97,7 +98,7 @@ public class HandoverTaskOrderDomainService { private IStockOutOrderService stockOutOrderService; @Autowired private CopyCodeReferenceDomainService copyCodeReferenceDomainService; - @Autowired + @Resource private OmsServiceFeign omsServiceFeign; // @Autowired // private ICustomsDeclarationDetailService customsDeclarationDetailService; @@ -250,7 +251,14 @@ public class HandoverTaskOrderDomainService { * @return Boolean */ public Boolean allocationPlatform(HandoverTaskOrderDO handoverTaskOrderDO){ - List handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIds = null; + if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { + handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() + .filter(str -> str != null && !str.trim().isEmpty()) + .map(Long::valueOf) + .collect(Collectors.toList()); + } if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { return false; } @@ -285,7 +293,14 @@ public class HandoverTaskOrderDomainService { * @return Boolean */ public Boolean releasePlatform(HandoverTaskOrderDO handoverTaskOrderDO){ - List handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIds = null; + if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { + handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() + .filter(str -> str != null && !str.trim().isEmpty()) + .map(Long::valueOf) + .collect(Collectors.toList()); + } if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { return false; } @@ -315,16 +330,14 @@ public class HandoverTaskOrderDomainService { * @return Boolean */ public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO) { - List handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); - System.out.println("completeHandover1111"+handoverTaskOrderIds); - List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIdsStr(); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIds = null; if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() .filter(str -> str != null && !str.trim().isEmpty()) .map(Long::valueOf) .collect(Collectors.toList()); } - System.out.println("completeHandover"+handoverTaskOrderIds); if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { return false; } @@ -707,7 +720,14 @@ public class HandoverTaskOrderDomainService { */ @Transactional(rollbackFor = Exception.class) public boolean taskDistribution(HandoverTaskOrderDO handoverTaskOrderDO) { - List handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIds(); + List handoverTaskOrderIds = null; + if (handoverTaskOrderIdsStr != null && !handoverTaskOrderIdsStr.isEmpty()) { + handoverTaskOrderIds = handoverTaskOrderIdsStr.stream() + .filter(str -> str != null && !str.trim().isEmpty()) + .map(Long::valueOf) + .collect(Collectors.toList()); + } if (handoverTaskOrderIds == null || handoverTaskOrderIds.isEmpty()) { throw new ServiceException("未选择交接作业单，请重新选择"); } @@ -719,7 +739,7 @@ public class HandoverTaskOrderDomainService { throw new ServiceException("交接作业单ID不能为空，请重新选择"); } // 更新 DO 对象中的列表，确保后续调用使用过滤后的列表 - handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderIds); + handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderIdsStr); List handoverTaskOrders = handoverTaskOrderService.list(new LambdaQueryWrapper() .in(HandoverTaskOrder::getHandoverTaskOrderId, handoverTaskOrderIds) .eq(HandoverTaskOrder::getTaskDistribution, 2) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index ac4c1cd4e..cd3ac6527 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -1397,7 +1397,7 @@ public class StockOutOrderDomainService { handoverTaskOrderDO1.setOperatorsBy(stockOutOrder.getWorkUserId()); List ids = new ArrayList<>(); ids.add(handoverTaskOrder.getHandoverTaskOrderId()); - handoverTaskOrderDO1.setHandoverTaskOrderIds(ids); + handoverTaskOrderDO1.setHandoverTaskOrderIds(ids.stream().map(String::valueOf).collect(Collectors.toList())); DeliveTask deliveTask = deliveTaskService.getOne(new LambdaQueryWrapper() .eq(DeliveTask::getTrackingNumber, handoverTaskOrder.getTaskNumber()) .eq(DeliveTask::getDelFlag, 1)); @@ -1412,7 +1412,7 @@ public class StockOutOrderDomainService { HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO(); List handoverTaskOrderId = new ArrayList<>(); handoverTaskOrderId.add(handoverTaskOrder.getHandoverTaskOrderId()); - handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderId); + handoverTaskOrderDO.setHandoverTaskOrderIds(handoverTaskOrderId.stream().map(String::valueOf).collect(Collectors.toList())); handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO); } //出库交接后生成电子签名记录 diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java index 33d70906b..dfe630a13 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/handoverTaskOrder/HandoverTaskOrderDTO.java @@ -131,36 +131,36 @@ public class HandoverTaskOrderDTO extends BaseVOEntity { private Long permissionMenuId; @ApiModelProperty("交接作业单id") - private List handoverTaskOrderIds; + private List handoverTaskOrderIds; /** * 自定义setter方法，支持单个整数和数组两种格式 */ - public void setHandoverTaskOrderIds(Object value) { - if (value == null) { - this.handoverTaskOrderIds = null; - return; - } - - List result = new ArrayList<>(); - - if (value instanceof List) { - // 如果是列表，遍历并转换 - List list = (List) value; - for (Object item : list) { - if (item != null) { - if (item instanceof Number) { - result.add(((Number) item).longValue()); - } - } - } - } else if (value instanceof Number) { - // 如果是单个数字，转换为列表 - result.add(((Number) value).longValue()); - } - - this.handoverTaskOrderIds = result.isEmpty() ? null : result; - } +// public void setHandoverTaskOrderIds(Object value) { +// if (value == null) { +// this.handoverTaskOrderIds = null; +// return; +// } +// +// List result = new ArrayList<>(); +// +// if (value instanceof List) { +// // 如果是列表，遍历并转换 +// List list = (List) value; +// for (Object item : list) { +// if (item != null) { +// if (item instanceof Number) { +// result.add(((Number) item).longValue()); +// } +// } +// } +// } else if (value instanceof Number) { +// // 如果是单个数字，转换为列表 +// result.add(((Number) value).longValue()); +// } +// +// this.handoverTaskOrderIds = result.isEmpty() ? null : result; +// } @ApiModelProperty("作业人用户ID") @Excel(name = "作业人用户ID")