Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

板件信息缺失字段补充、预留边字段补充

Browse Source
This commit is contained in:
gaoqr
2026-06-15 09:16:00 +08:00
parent 08517a7892
commit 3987d86200
6 changed files with 114 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PlateDetailsRespVO.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class PlateDetailsRespVO {
@Schema(description = "异形") @Schema(description = "异形")
@ExcelProperty("异形") @ExcelProperty("异形")
private Boolean specialShaped; private Boolean isSpecialShaped;
@Schema(description = "正反面造型") @Schema(description = "正反面造型")
@ExcelProperty("正反面造型") @ExcelProperty("正反面造型")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
+11
View File
@@ -108,6 +108,17 @@ public class PlateDetailRespVO {
@Schema(description = "下封边厚度", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "下封边厚度", requiredMode = Schema.RequiredMode.REQUIRED)
private BigDecimal sealDown; private BigDecimal sealDown;
@Schema(description = "左预留边")
private BigDecimal reservedEdgeLeft;
@Schema(description = "右预留边")
private BigDecimal reservedEdgeRight;
@Schema(description = "上预留边")
private BigDecimal reservedEdgeUp;
@Schema(description = "下预留边")
private BigDecimal reservedEdgeDown;
@Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "面积", requiredMode = Schema.RequiredMode.REQUIRED)
private BigDecimal area; private BigDecimal area;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderViewPlatePageRespVO.java
+12
View File
@@ -73,6 +73,18 @@ public class OrderViewPlatePageRespVO {
@Schema(description = "下封边厚度") @Schema(description = "下封边厚度")
private BigDecimal sealDown; private BigDecimal sealDown;
@Schema(description = "左预留边")
private BigDecimal reservedEdgeLeft;
@Schema(description = "右预留边")
private BigDecimal reservedEdgeRight;
@Schema(description = "上预留边")
private BigDecimal reservedEdgeUp;
@Schema(description = "下预留边")
private BigDecimal reservedEdgeDown;
@Schema(description = "材质") @Schema(description = "材质")
private String material; private String material;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrdersViewPlatesPageDO.java
+20
View File
@@ -92,6 +92,26 @@ public class OrdersViewPlatesPageDO {
*/ */
private BigDecimal sealDown; private BigDecimal sealDown;
/**
* 左预留边
*/
private BigDecimal reservedEdgeLeft;
/**
* 右预留边
*/
private BigDecimal reservedEdgeRight;
/**
* 上预留边
*/
private BigDecimal reservedEdgeUp;
/**
* 下预留边
*/
private BigDecimal reservedEdgeDown;
/** /**
* 材质 * 材质
*/ */
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
+20
View File
@@ -148,6 +148,26 @@ public class PlateDetailDO {
*/ */
private BigDecimal sealDown; private BigDecimal sealDown;
/**
* 左预留边
*/
private BigDecimal reservedEdgeLeft;
/**
* 右预留边
*/
private BigDecimal reservedEdgeRight;
/**
* 上预留边
*/
private BigDecimal reservedEdgeUp;
/**
* 下预留边
*/
private BigDecimal reservedEdgeDown;
/** /**
* 面积 * 面积
*/ */
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+50 -47
View File
@@ -460,6 +460,10 @@
op.seal_right as sealRight, op.seal_right as sealRight,
op.seal_up as sealUp, op.seal_up as sealUp,
op.seal_down as sealDown, op.seal_down as sealDown,
op.reserved_edge_left AS reservedEdgeLeft,
op.reserved_edge_right AS reservedEdgeRight,
op.reserved_edge_up AS reservedEdgeUp,
op.reserved_edge_down AS reservedEdgeDown,
op.area as area, op.area as area,
op.texture as texture, op.texture as texture,
op.hole_face as holeFace, op.hole_face as holeFace,
@@ -572,6 +576,10 @@
op.seal_right as sealRight, op.seal_right as sealRight,
op.seal_up as sealUp, op.seal_up as sealUp,
op.seal_down as sealDown, op.seal_down as sealDown,
op.reserved_edge_left AS reservedEdgeLeft,
op.reserved_edge_right AS reservedEdgeRight,
op.reserved_edge_up AS reservedEdgeUp,
op.reserved_edge_down AS reservedEdgeDown,
op.area as area, op.area as area,
op.texture as texture, op.texture as texture,
op.hole_face as holeFace, op.hole_face as holeFace,
@@ -1039,7 +1047,7 @@
<result property="thickness" column="plateThickness"/> <result property="thickness" column="plateThickness"/>
<result property="area" column="plateArea"/> <result property="area" column="plateArea"/>
<result property="texture" column="texture"/> <result property="texture" column="texture"/>
<result property="specialShaped" column="specialShaped"/> <result property="isSpecialShaped" column="isSpecialShaped"/>
<result property="isSculpt" column="isSculpt"/> <result property="isSculpt" column="isSculpt"/>
<result property="isRowHole" column="isRowHole"/> <result property="isRowHole" column="isRowHole"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
@@ -1113,7 +1121,6 @@
<select id="selectOrdersPackPlateList" <select id="selectOrdersPackPlateList"
parameterType="java.lang.Long"
resultMap="PlateDetailsMap"> resultMap="PlateDetailsMap">
SELECT SELECT
og.name AS processGroup, og.name AS processGroup,
@@ -1142,22 +1149,18 @@
op.texture, op.texture,
op.remark, op.remark,
op.is_special_shaped AS specialShaped, op.hole_face as holeFace,
op.is_sculpt AS isSculpt, op.hole_arrange as holeArrange,
op.is_row_hole AS isRowHole, op.open_door_type as openDoorType,
op.front_hole_count AS frontHoleCount, op.split_width as splitWidth,
op.back_hole_count AS backHoleCount, op.split_height as splitHeight,
op.side_hole_count AS sideHoleCount,
op.open_door_type AS openDoorType,
op.is_side_sculpt AS isSideSculpt,
op.is_2v AS is2v,
op.is_side_2v AS isSide2v,
op.split_width AS splitWidth,
op.split_height AS splitHeight,
op.seal_left AS sealLeft, op.seal_left AS sealLeft,
op.seal_right AS sealRight, op.seal_right AS sealRight,
op.seal_up AS sealUp, op.seal_up AS sealUp,
op.seal_down AS sealDown op.seal_down AS sealDown,
op.is_sculpt AS isSculpt,
CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
op.is_row_hole AS isRowHole
FROM order_plate op FROM order_plate op
@@ -1233,22 +1236,18 @@
op.texture, op.texture,
op.remark, op.remark,
op.is_special_shaped AS specialShaped, op.hole_face as holeFace,
op.is_sculpt AS isSculpt, op.hole_arrange as holeArrange,
op.is_row_hole AS isRowHole, op.open_door_type as openDoorType,
op.front_hole_count AS frontHoleCount, op.split_width as splitWidth,
op.back_hole_count AS backHoleCount, op.split_height as splitHeight,
op.side_hole_count AS sideHoleCount, op.seal_left AS sealLeft,
op.open_door_type AS openDoorType, op.seal_right AS sealRight,
op.is_side_sculpt AS isSideSculpt, op.seal_up AS sealUp,
op.is_2v AS is2v, op.seal_down AS sealDown,
op.is_side_2v AS isSide2v, CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
op.split_width AS splitWidth, op.is_sculpt AS isSculpt,
op.split_height AS splitHeight, op.is_row_hole AS isRowHole
op.seal_left AS sealLeft,
op.seal_right AS sealRight,
op.seal_up AS sealUp,
op.seal_down AS sealDown
FROM order_item oi FROM order_item oi
@@ -1323,22 +1322,18 @@
op.texture, op.texture,
op.remark, op.remark,
op.is_special_shaped AS specialShaped, op.hole_face as holeFace,
op.is_sculpt AS profiling, op.hole_arrange as holeArrange,
op.is_row_hole AS rowHole, op.open_door_type as openDoorType,
op.front_hole_count AS frontHoleCount, op.split_width as splitWidth,
op.back_hole_count AS backHoleCount, op.split_height as splitHeight,
op.side_hole_count AS sideHoleCount, op.seal_left AS sealLeft,
op.open_door_type AS openDoorType, op.seal_right AS sealRight,
op.is_side_sculpt AS isSideSculpt, op.seal_up AS sealUp,
op.is_2v AS is2v, op.seal_down AS sealDown,
op.is_side_2v AS isSide2v, CASE WHEN op.unregular_point_count > 0 THEN 1 ELSE 0 END AS isSpecialShaped,
op.split_width AS splitWidth, op.is_sculpt AS isSculpt,
op.split_height AS splitHeight, op.is_row_hole AS isRowHole
op.seal_left AS sealLeft,
op.seal_right AS sealRight,
op.seal_up AS sealUp,
op.seal_down AS sealDown
FROM order_item oi FROM order_item oi
@@ -1506,6 +1501,10 @@
p.seal_down, p.seal_down,
p.seal_right, p.seal_right,
p.seal_up, p.seal_up,
p.reserved_edge_left AS reservedEdgeLeft,
p.reserved_edge_right AS reservedEdgeRight,
p.reserved_edge_up AS reservedEdgeUp,
p.reserved_edge_down AS reservedEdgeDown,
p.area, p.area,
p.texture, p.texture,
(p.unregular_point_count > 0 ) AS isSpecialShaped, (p.unregular_point_count > 0 ) AS isSpecialShaped,
@@ -1639,6 +1638,10 @@
p.seal_down, p.seal_down,
p.seal_right, p.seal_right,
p.seal_up, p.seal_up,
p.reserved_edge_left AS reservedEdgeLeft,
p.reserved_edge_right AS reservedEdgeRight,
p.reserved_edge_up AS reservedEdgeUp,
p.reserved_edge_down AS reservedEdgeDown,
p.area, p.area,
p.texture, p.texture,
(p.unregular_point_count > 0 ) AS isSpecialShaped, (p.unregular_point_count > 0 ) AS isSpecialShaped,