发31

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<Long> handoverTaskOrderIds;
+    @ApiModelProperty("交接作业单id")
+    private List<String> handoverTaskOrderIdsStr;
 
     @ApiModelProperty("作业人用户ID")
     @Excel(name = "作业人用户ID")

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<Long> handoverTaskOrderIds = handoverTaskOrderDO.getHandoverTaskOrderIds();
+        System.out.println("completeHandover1111"+handoverTaskOrderIds);
+        List<String> 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;
         }

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 {
 
 
 
-}
+}