From 6cd456701adfa4f8b5331b2cd9ca5c4df65ce783 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 30 一月 2026 15:59:58 +0800
Subject: [PATCH] 指标维护字段筛选
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index ccc29e0..1cfc0d8 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -58,27 +58,40 @@
</select>
<select id="listProductionDetails" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
SELECT
- slpa.scheduling_date,
- slpa.scheduling_user_name,
- sl.sales_contract_no,
- sl.customer_name,
- p.product_name,
- pm.model,
- pm.unit,
- slpa.process,
- ppo.quantity,
- slpa.work_hours,
- slpa.work_hours * slpa.finished_num AS wages
+ slpa.scheduling_date,
+ slpa.scheduling_user_name,
+ sl.sales_contract_no,
+ sl.customer_name,
+ p.product_name,
+ pm.model as product_model_name,
+ pm.unit,
+ slpa.process,
+ ppo.quantity,
+ slpa.work_hours,
+ slpa.work_hours * slpa.finished_num AS wages
FROM
- production_product_main ppm
- LEFT JOIN sales_ledger_production_accounting slpa ON slpa.sales_ledger_work_id = ppm.id
- LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
- LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
- LEFT JOIN product_order po ON po.id = pwo.product_order_id
- LEFT JOIN process_route pr ON pr.id = po.route_id
- LEFT JOIN product_model pm ON po.product_model_id = pm.id
- LEFT JOIN product p ON p.id = pm.product_id
- LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
+ production_product_main ppm
+ LEFT JOIN sales_ledger_production_accounting slpa ON slpa.sales_ledger_work_id = ppm.id
+ LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
+ LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ LEFT JOIN process_route pr ON pr.id = po.route_id
+ LEFT JOIN product_model pm ON po.product_model_id = pm.id
+ LEFT JOIN product p ON p.id = pm.product_id
+ LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
+ <where>
+ <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
+ and slpa.scheduling_user_name = #{ew.schedulingUserName}
+ </if>
+ <if test="ew.entryDate != null " >
+ and slpa.scheduling_date >= #{ew.entryDate}
+ and slpa.scheduling_date < DATE_ADD(#{ew.entryDate}, INTERVAL 1 DAY)
+ </if>
+ <if test="ew.entryDateStart != null and ew.entryDateEnd != null" >
+ and slpa.scheduling_date >= #{ew.entryDateStart}
+ and slpa.scheduling_date < date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
+ </if>
+ </where>
</select>
<delete id="deleteByWorkOrderIds" parameterType="java.util.List">
--
Gitblit v1.9.3