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 b81215fde..50db1db68 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 @@ -131,6 +131,8 @@ public class HandoverTaskOrderDO extends BaseVOEntity { @ApiModelProperty("交接作业单id") private List handoverTaskOrderIds; + @ApiModelProperty("交接作业单id") + private List handoverTaskOrderIdsStr; @ApiModelProperty("作业人用户ID") @Excel(name = "作业人用户ID") 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 3d9730886..9eb78b080 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 @@ -316,6 +316,15 @@ public class HandoverTaskOrderDomainService { */ public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO) { List handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds(); + System.out.println("completeHandover1111"+handoverTaskOrderIds); + List handoverTaskOrderIdsStr = handoverTaskOrderDO.getHandoverTaskOrderIdsStr(); + 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; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java index 1f4aee591..75c444212 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/handoverTaskOrder/HandoverTaskOrderApi.java @@ -111,6 +111,7 @@ public class HandoverTaskOrderApi extends BaseController { @ApiOperation("完成交接") @PostMapping("/completeHandover") public AjaxResult completeHandover(@RequestBody HandoverTaskOrderDTO handoverTaskOrderDTO) { + System.out.println("completeHandover"+handoverTaskOrderDTO.getHandoverTaskOrderIds()); HandoverTaskOrderDO handoverTaskOrderDO = handoverTaskOrderAssembler.toDO(handoverTaskOrderDTO); return toAjax(handoverTaskOrderApplicationService.completeHandover(handoverTaskOrderDO)); } @@ -125,4 +126,4 @@ public class HandoverTaskOrderApi extends BaseController { -} +} \ No newline at end of file