diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java index 37d89fbb3..6b56080d0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java @@ -94,6 +94,15 @@ public class PlateDetailsRespVO { @ExcelProperty("排孔") private Boolean rowHole; + @Schema(description = "正面孔数量") + private Integer frontHoleCount; + + @Schema(description = "背面孔数量") + private Integer backHoleCount; + + @Schema(description = "侧面孔数量") + private Integer sideHoleCount; + @Schema(description = "加工组") @ExcelProperty("加工组") private String processGroup; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java index 355653cbd..a88691bbc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/query/vo/pack/PackageDetailsRespVO.java @@ -138,11 +138,14 @@ public class PackageDetailsRespVO { @Schema(description = "加工组-用于计算-不显示") private List groupId; - @Schema(description = "排版面") - private String holeFace; + @Schema(description = "正面孔数量") + private Integer frontHoleCount; - @Schema(description = "排孔类型") - private String holeArrange; + @Schema(description = "背面孔数量") + private Integer backHoleCount; + + @Schema(description = "侧面孔数量") + private Integer sideHoleCount; @Schema(description = "开门类型") private String openDoorType; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index c0645e822..97e49ae4a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -777,6 +777,9 @@ + + + @@ -869,8 +872,9 @@ op.is_special_shaped AS specialShaped, op.is_sculpt AS profiling, op.is_row_hole AS rowHole, - op.hole_face AS holeFace, - op.hole_arrange AS holeArrange, + op.front_hole_count AS frontHoleCount, + op.back_hole_count AS backHoleCount, + op.side_hole_count AS sideHoleCount, op.open_door_type AS openDoorType, op.is_side_sculpt AS isSideSculpt, op.is_2v AS is2v, @@ -952,8 +956,9 @@ op.is_special_shaped AS specialShaped, op.is_sculpt AS profiling, op.is_row_hole AS rowHole, - op.hole_face AS holeFace, - op.hole_arrange AS holeArrange, + op.front_hole_count AS frontHoleCount, + op.back_hole_count AS backHoleCount, + op.side_hole_count AS sideHoleCount, op.open_door_type AS openDoorType, op.is_side_sculpt AS isSideSculpt, op.is_2v AS is2v, @@ -1035,8 +1040,9 @@ op.is_special_shaped AS specialShaped, op.is_sculpt AS profiling, op.is_row_hole AS rowHole, - op.hole_face AS holeFace, - op.hole_arrange AS holeArrange, + op.front_hole_count AS frontHoleCount, + op.back_hole_count AS backHoleCount, + op.side_hole_count AS sideHoleCount, op.open_door_type AS openDoorType, op.is_side_sculpt AS isSideSculpt, op.is_2v AS is2v, @@ -1223,8 +1229,9 @@ - - + + +