From 94818069cd6ef8455f5779ba73f89096b6307e44 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 9 May 2024 16:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-=E6=8E=92=E5=8D=95-=E6=96=B0=E5=A2=9E=E6=8E=92?= =?UTF-8?q?=E5=8D=95-=E6=9D=BF=E4=BB=B6=E5=8F=82=E6=95=B0=EF=BC=8CSQL?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/controller/admin/plan/vo/PlatePage.java | 10 ++++++++++ .../src/main/resources/mapper/plate/PlateMapper.xml | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) 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