新增webcad生产单导入：增加部分数字型入参校验

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java

@@ -5,6 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,10 +24,19 @@ public class WebCadDataBlockReqVO {
     private String name;
     private Integer type;
     private Integer custBlockNo;
+
+    @Max(value = 99999, message = "板件宽度不能超过99999")
+    @Min(value = 0, message = "板件宽度最小值为0")
     private Double width;
+
+    @Max(value = 99999, message = "板件高度不能超过99999")
+    @Min(value = 0, message = "板件高度最小值为0")
     private Double height;
     private String material;
     private String materialName;
+
+    @Max(value = 99999, message = "板件厚度不能超过99999")
+    @Min(value = 0, message = "板件厚度最小值为0")
     private Double thickness;
     private Integer boardType;
     private Double area;
@@ -49,6 +61,8 @@ public class WebCadDataBlockReqVO {
     private String remark;
     private Double kaiLiaoHeight;
     private Double kaiLiaoWidth;
+
+    @Valid
     private InfoDTO info;
     private String cabinetName;
     private String roomName;
@@ -91,7 +105,13 @@ public class WebCadDataBlockReqVO {
         private String spliteWidth;
         private Boolean isRect;
         private List<List<String>> remarks;
+
+        @Max(value = 99999, message = "板件开料宽度不能超过99999")
+        @Min(value = 0, message = "板件开料宽度最小值为0")
         private Double kaiLiaoWidth;
+
+        @Max(value = 99999, message = "板件开料高度不能超过99999")
+        @Min(value = 0, message = "板件开料高度最小值为0")
         private Double kaiLiaoHeight;
         private Integer openDir;
     }

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataDoubleRoomTreeReqVO.java

@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -32,6 +33,7 @@ public class WebCadDataDoubleRoomTreeReqVO {
 
         @NotNull(message = "拆单倍数不能为空")
         @Max(value = 5000, message = "拆单倍数不能超过5000")
+        @Min(value = 1, message = "拆单倍数最小值为1")
         private Integer count;
     }
 }

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataPartsReqVO.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,10 +40,16 @@ public class WebCadDataPartsReqVO {
 
         private String spec;
 
+        @Max(value = 99999, message = "配件宽度不能超过99999")
+        @Min(value = 0, message = "配件宽度最小值为0")
         private String width;
 
+        @Max(value = 99999, message = "配件高度不能超过99999")
+        @Min(value = 0, message = "配件高度最小值为0")
         private String height;
 
+        @Max(value = 99999, message = "配件厚度不能超过99999")
+        @Min(value = 0, message = "配件厚度最小值为0")
         private String thickness;
 
         private String material;

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataProcessGroupReqVO.java

@@ -4,6 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.util.List;
 
 /**
@@ -18,6 +21,7 @@ public class WebCadDataProcessGroupReqVO {
 
     private String type;
 
+    @Valid
     private List<ProjectsDTO> projects;
 
     @NoArgsConstructor
@@ -30,6 +34,7 @@ public class WebCadDataProcessGroupReqVO {
 
         private List<Integer> objIds;
 
+        @Valid
         private BoxSizeDTO boxSize;
 
         private Integer groupID;
@@ -38,10 +43,16 @@ public class WebCadDataProcessGroupReqVO {
         @Data
         public static class BoxSizeDTO {
 
+            @Max(value = 99999, message = "加工组涉及柜体宽度不能超过99999")
+            @Min(value = 0, message = "加工组涉及柜体宽度最小值为0")
             private Double width;
 
+            @Max(value = 99999, message = "加工组涉及柜体高度不能超过99999")
+            @Min(value = 0, message = "加工组涉及柜体高度最小值为0")
             private Double height;
 
+            @Max(value = 99999, message = "加工组涉及柜体深度不能超过99999")
+            @Min(value = 0, message = "加工组涉及柜体深度最小值为0")
             private Double depth;
         }
     }

cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataReqVO.java

@@ -25,12 +25,14 @@ public class WebCadDataReqVO {
 
     @JsonProperty(value = "Blocks")
     @Size(max = 20000, message = "拆单板件片数单次不能超过2万片")
+    @Valid
     private List<WebCadDataBlockReqVO> Blocks;
 
     @JsonProperty(value = "Parts")
     private WebCadDataPartsReqVO Parts;
 
     @JsonProperty(value = "ProcessGroup")
+    @Valid
     private List<WebCadDataProcessGroupReqVO> ProcessGroup;
 
     @Valid