From 2ec01b26bc1f3508203bb919502d585011a6c2b8 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 12 Jun 2026 18:21:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=A0=E5=9E=8B=E5=92=8C=E6=8E=92=E5=AD=94?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pack/vo/PlateDetailsRespVO.java | 4 ++-- .../query/vo/pack/PackageDetailsRespVO.java | 4 ++-- .../admin/plan/vo/PlateDetailRespVO.java | 2 +- .../dal/dataobject/plate/PlateDetailDO.java | 2 +- .../mapper/planitem/PlanItemMapper.xml | 4 ++-- .../resources/mapper/plate/PlateMapper.xml | 23 +++++++++---------- 6 files changed, 19 insertions(+), 20 deletions(-) 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 447c894e3..8eac9652d 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 @@ -88,11 +88,11 @@ public class PlateDetailsRespVO { @Schema(description = "正反面造型") @ExcelProperty("正反面造型") - private Boolean profiling; + private Boolean isSculpt; @Schema(description = "排孔") @ExcelProperty("排孔") - private Boolean rowHole; + private Boolean isRowHole; @Schema(description = "正面孔数量") private Integer frontHoleCount; 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 882eb3bb2..17b5d409d 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 @@ -62,10 +62,10 @@ public class PackageDetailsRespVO { private Boolean specialShaped; @Schema(description = "是否造型") - private Boolean profiling; + private Boolean isSculpt; @Schema(description = "是否有孔") - private Boolean rowHole; + private Boolean isRowHole; @Schema(description = "加工组") 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/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java index 489796ab6..b5f66d585 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java @@ -196,7 +196,7 @@ public class PlateDetailRespVO { @Schema(description = "是否有孔", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean hasHole; + private Boolean isRowHole; @Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java index eb671b3a9..497fa9c2a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java @@ -266,7 +266,7 @@ public class PlateDetailDO { /** * 是否有孔 */ - private Boolean hasHole; + private Boolean isRowHole; /** * 是否造型 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml index 9335cbaab..0d2a719ca 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml @@ -422,7 +422,7 @@ - + @@ -474,7 +474,7 @@ op.offset_y as offsetY, op.is_special_shaped as isSpecialShaped, op.is_sculpt as isSculpt, - op.is_row_hole as hasHole, + op.is_row_hole as isRowHole, op.remark as remark, op.model_data as modelData, oi.body_id as bodyId, 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 c11819668..8a171835f 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 @@ -64,14 +64,13 @@ - + - @@ -472,7 +471,7 @@ (op.unregular_point_count > 0 ) AS isSpecialShaped, op.is_sculpt as isSculpt, op.is_side_sculpt AS sideModel, - op.is_row_hole as hasHole, + op.is_row_hole as isRowHole, op.remark as remark, op.model_data as modelData, op.is_2v as is2v, @@ -583,7 +582,7 @@ op.offset_y as offsetY, (op.unregular_point_count > 0 ) AS isSpecialShaped, op.is_sculpt as isSculpt, - op.is_row_hole as hasHole, + op.is_row_hole as isRowHole, op.remark as remark, op.model_data as modelData, op.is_2v as is2v, @@ -1041,8 +1040,8 @@ - - + + @@ -1144,8 +1143,8 @@ op.remark, op.is_special_shaped AS specialShaped, - op.is_sculpt AS profiling, - op.is_row_hole AS rowHole, + op.is_sculpt AS isSculpt, + op.is_row_hole AS isRowHole, op.front_hole_count AS frontHoleCount, op.back_hole_count AS backHoleCount, op.side_hole_count AS sideHoleCount, @@ -1235,8 +1234,8 @@ op.remark, op.is_special_shaped AS specialShaped, - op.is_sculpt AS profiling, - op.is_row_hole AS rowHole, + op.is_sculpt AS isSculpt, + op.is_row_hole AS isRowHole, op.front_hole_count AS frontHoleCount, op.back_hole_count AS backHoleCount, op.side_hole_count AS sideHoleCount, @@ -1696,8 +1695,8 @@ - - + +