Merge branch 'dev' into dev-ty1.2

# Conflicts:
#	mhd_wms/src/main/resources/bootstrap.yml

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<Long> handoverTaskOrderIds;
+    private List<String> handoverTaskOrderIds;
 
     /**
      * 自定义setter方法，支持单个整数和数组两种格式
      */
-    public void setHandoverTaskOrderIds(Object value) {
-        if (value == null) {
-            this.handoverTaskOrderIds = null;
-            return;
-        }
-        
-        List<Long> 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<Long> 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")

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java

@@ -314,4 +314,6 @@ public class MaterialBaseInfoDTO extends BaseVOEntity {
 
     @ApiModelProperty(name = "组织(多个用,分开)")
     private String orgId;
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }

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