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-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

cad拆单order_plate二维刀路字段名修改

Browse Source
This commit is contained in:
gaoqr
2025-05-16 10:09:55 +08:00
parent 680ceeba29
commit ed49597be1
6 changed files with 35 additions and 32 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/order/vo/order/OrderPlatesDetailReqVO.java
+4 -4
View File
@@ -60,17 +60,17 @@ public class OrderPlatesDetailReqVO {
@Schema(description = "是否异形", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean isSpecialShaped;
@Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean isSculpt;
@Schema(description = "是否侧面造型")
private boolean isSideSculpt;
private Boolean isSideSculpt;
@Schema(description = "是否二维刀路")
private boolean has2DModel;
private Boolean is2v;
@Schema(description = "是否侧面二维刀路")
private boolean hasSide2DModel;
private Boolean isSide2v;
@Schema(description = "是否排孔", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean isRowHole;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java
+5 -5
View File
@@ -156,18 +156,18 @@ public class PlateRespVO extends PageParam {
@ExcelProperty("是否异形")
private Boolean isSpecialShaped;
@Schema(description = "是否造型", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否造型")
@Schema(description = "是否正反面造型", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否正反面造型")
private Boolean isSculpt;
@Schema(description = "是否侧面造型")
private boolean isSideSculpt;
private Boolean isSideSculpt;
@Schema(description = "是否二维刀路")
private boolean has2DModel;
private Boolean is2v;
@Schema(description = "是否侧面二维刀路")
private boolean hasSide2DModel;
private Boolean isSide2v;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
@ExcelProperty("备注")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<select id="selectPlatesDetailByOrderId" resultType="com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO">
SELECT DISTINCT i.order_id, p.id, p.plate_no, g.material, p.name, p.area, p.seal_left, p.seal_down,
p.seal_right, p.seal_up, p.texture, p.is_special_shaped, p.is_sculpt,p.is_side_sculpt,p.has_2d_model, p.has_side_2d_model, p.unregular_point_count, p.front_hole_count,
p.seal_right, p.seal_up, p.texture, p.is_special_shaped, p.is_sculpt,p.is_side_sculpt,p.is_2v, p.is_side_2v, p.unregular_point_count, p.front_hole_count,
p.back_hole_count, p.side_hole_count,p.width,p.height,p.thickness,p.remark,g.color,p.is_row_hole, p.custom_plate_no
FROM order_item i
RIGHT JOIN `order_plate` p ON i.plate_id = p.id