diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java index 16fa077ed..7dc39e75b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlatePage.java @@ -40,4 +40,14 @@ public class PlatePage { private String customOrderNo; @Schema(description = "备注") private String remark; + + + @Schema(description = "板件数量") + private Long num; + + @Schema(description = "异形", requiredMode = Schema.RequiredMode.REQUIRED) + private String specialShaped; + + @Schema(description = "造型", requiredMode = Schema.RequiredMode.REQUIRED) + private String profiling; } 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 a3080d307..d2e13922e 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 @@ -23,9 +23,11 @@ select a.id as plateId, a.name, a.width, a.height, a.thickness, a.area, b.custom_order_no, b.customer, b.address, b.remark, b.id as orderId, - c.goods_name, c.material, c.color, c.goods_id + c.goods_name, c.material, c.color, c.goods_id,oi.num, + CASE WHEN a.unregular_point_count = 0 THEN '否' ELSE '是' END AS specialShaped, + CASE WHEN front_model_count = 0 or a.back_hole_count or a.side_hole_count THEN '否' ELSE '是' END AS profiling from order_plate a --- LEFT JOIN order_item oi on a.order_id = oi.order_id + LEFT JOIN order_item oi on a.id = oi.plate_id LEFT JOIN `order` b on a.order_id = b.id LEFT JOIN order_goods c on a.goods_id = c.goods_id