From 01f13adb4d14aa91265010d8a59f9eed22199274 Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 12 Jul 2024 18:21:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E3=80=91=E4=B8=8B=E7=BA=BF=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectorder/ProjectOrderSubMapper.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java index 108435dc..9ce32d49 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/projectorder/ProjectOrderSubMapper.java @@ -163,18 +163,11 @@ public interface ProjectOrderSubMapper extends BaseMapperX { .select("c.name as customerName") .select("d.name as projectSubName", "d.code as projectSubCode") .select("COALESCE(SUM(case when g.is_final=1 and g.name!='成品包装' then h.amount else 0 end), 0) as reportAmount") - .select("(SELECT count(distinct g.name,IFNULL(h.assemble_code,'')) " + - "FROM project_sale_order_sub o " + - "LEFT JOIN project_sale_order a ON (a.id = o.project_order_id) " + - "LEFT JOIN project_plan b ON (b.project_id = a.id) " + - "LEFT JOIN base_customer c ON (c.id = a.customer_id) " + - "LEFT JOIN base_material d ON (d.id = o.material_id) " + - "LEFT JOIN pro_task_dispatch e ON (e.project_sub_id = o.id) " + - "LEFT JOIN pro_task_dispatch_detail f ON (f.dispatch_id = e.id) " + - "LEFT JOIN base_procedure g ON (g.id = f.procedure_id AND g.is_final = 1) " + - "LEFT JOIN pro_task_report h ON (h.dispatch_detail_id = f.id AND h.has_report = 1) " + - "WHERE o.deleted=0 AND (a.order_status = 8 AND a.is_snapshot = 0) and g.name='成品包装' and o.id=t.id " + - ") reportAmount1") + .select("ifnull((select amount from ( " + + "select a.material_id,a.project_id,sum(a.amount) as amount from " + + " (select distinct assemble_code,material_id,procedure_id,amount,SUBSTRING_INDEX(assemble_code,'-',1) as project_id from pro_task_report where isnull(assemble_code)=0) as a " + + "group by a.material_id,a.project_id) as b where b.material_id=t.material_id and b.project_id=t.project_order_id " + + "),0) reportAmount1") .select("b.status as planStatus") .leftJoin(ProjectOrderDO.class, "a", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId) .leftJoin(PlanDO.class, "b", PlanDO::getProjectId, ProjectOrderDO::getId)