计算用板量Bug修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetialRespVO.java

@@ -110,27 +110,27 @@ public class PlateDetialRespVO {
 
 
     @Schema(description = "异型孔数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "28477")
-    private Short unregularPointCount;
+    private Integer unregularPointCount;
 
 
     @Schema(description = "正面孔数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "20823")
-    private Short frontHoleCount;
+    private Integer frontHoleCount;
 
 
     @Schema(description = "背面孔数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3441")
-    private Short backHoleCount;
+    private Integer backHoleCount;
 
 
     @Schema(description = "侧面孔数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "25509")
-    private Short sideHoleCount;
+    private Integer sideHoleCount;
 
 
     @Schema(description = "正面造型量", requiredMode = Schema.RequiredMode.REQUIRED, example = "31547")
-    private Short frontModelCount;
+    private Integer frontModelCount;
 
 
     @Schema(description = "背面造型量", requiredMode = Schema.RequiredMode.REQUIRED, example = "26725")
-    private Short backModelCount;
+    private Integer backModelCount;
 
 
     @Schema(description = "是否门板", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -150,7 +150,7 @@ public class PlateDetialRespVO {
 
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer filterType;
+    private String filterType;
 
 
     @Schema(description = "异型偏移 x", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -186,7 +186,7 @@ public class PlateDetialRespVO {
     private Integer openDoorType;
 
 
-    @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean  hasHole;
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateGoodsRespVO.java

@@ -164,7 +164,7 @@ public class PlateGoodsRespVO {
     private Long moduleTypeId;
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", example = "1")
-    private Integer filterType;
+    private String filterType;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java

@@ -110,7 +110,7 @@ public class PlatePageReqVO extends PageParam {
     private Long moduleTypeId;
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", example = "1")
-    private Integer filterType;
+    private String filterType;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java

@@ -147,7 +147,7 @@ public class PlateRespVO {
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠")
-    private Integer filterType;
+    private String filterType;
 
     @Schema(description = "是否异形", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否异形")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateSaveReqVO.java

@@ -139,7 +139,7 @@ public class PlateSaveReqVO {
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠不能为空")
-    private Integer filterType;
+    private String filterType;
 
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @NotEmpty(message = "备注不能为空")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -140,7 +140,7 @@
                         ob.room_name as roomName,
                         og.id as processGroupId,
                         og.name as processGroupName,
-                        CASE WHEN op.unregular_point_count = 0 and op.front_hole_count  = 0  and op.back_hole_count = 0 and op.side_hole_count = 0 THEN false ELSE true END AS hasHole
+                        op.is_row_hole as  hasHole
         from order_plate op
                  left join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
                  join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/patching/vo/PatchingDetailRespVO.java

@@ -159,7 +159,7 @@ public class PatchingDetailRespVO {
     private Long moduleTypeId;
 
     @Schema(description = "排单过滤类型，1 有挖穿造型 2 有挖穿孔 4 有二维刀路 8 可叠", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer filterType;
+    private String filterType;
 
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
     private String remark;

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -208,7 +208,7 @@ public interface ErrorCodeConstants {
     ErrorCode DEFAULT_TEMPLATE_NOT_DELETED = new ErrorCode(1_002_029_004, "不能删除默认模板");
     ErrorCode NOT_TEMPLATE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台模板权限");
     ErrorCode NOT_MACHINE_AUTH = new ErrorCode(1_002_029_005, "该组织无此机台权限");
-    ErrorCode THE_CURRENT_MACHINE_IS_ALREADY_IN_USE = new ErrorCode(1_002_029_005, "当前机台已使用，禁止删除");
+    ErrorCode THE_CURRENT_MACHINE_IS_ALREADY_IN_USE = new ErrorCode(1_002_029_006, "当前机台已使用，禁止删除");
 
     // ========== 标签模板  1-002-300-000 ==========
     ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在");