From d1fac30e634e33edd29e3440de1f91da84c150c1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 05 六月 2026 15:38:39 +0800
Subject: [PATCH] feat(account): 新增付款状态管理功能并优化生产任务查询
---
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml | 73 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 5ecf0e9..bcaf4f1 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -21,21 +21,29 @@
<result column="dept_id" property="deptId" />
</resultMap>
- <select id="pageProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
- select pot.*,
- po.nps_no as npsNo,
- po.is_end_order as endOrder,
- p.product_name as productName,
- pm.model as model,
- pm.unit as unit,
- poro.operation_name as operationName,
- poro.type as type,
- IFNULL(scrapStat.scrapQty, 0) AS scrapQty,
- ROUND(IFNULL(pot.complete_quantity, 0) / NULLIF(pot.plan_quantity, 0) * 100, 2) AS completionStatus,
- CASE
- WHEN pot.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
- ELSE '姝ｅ父'
- END AS work_order_type
+ <sql id="groupedProductionOperationTaskSelect">
+ select po.id as productionOrderId,
+ po.nps_no as npsNo,
+ po.is_end_order as endOrder,
+ p.product_name as productName,
+ pm.model as model,
+ pm.unit as unit,
+ group_concat(distinct poro.operation_name order by poro.drag_sort, poro.operation_name separator ',') as operationName,
+ count(distinct pot.id) as productionTaskCount,
+ sum(ifnull(pot.plan_quantity, 0)) as planQuantity,
+ sum(ifnull(pot.complete_quantity, 0)) as completeQuantity,
+ sum(ifnull(pot.complete_quantity, 0)) as goodQuantity,
+ sum(ifnull(scrapStat.scrapQty, 0)) as scrapQty,
+ round(sum(ifnull(pot.complete_quantity, 0)) / nullif(sum(ifnull(pot.plan_quantity, 0)), 0) * 100, 2) as completionStatus,
+ max(poro.type) as type,
+ case when sum(case when pot.work_order_no like 'FG%' then 1 else 0 end) > 0
+ then '杩斿伐杩斾慨' else '姝ｅ父' end as workOrderType,
+ group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
+ min(pot.plan_start_time) as planStartTime,
+ max(pot.plan_end_time) as planEndTime,
+ min(pot.actual_start_time) as actualStartTime,
+ max(pot.actual_end_time) as actualEndTime,
+ max(pot.status) as status
from production_operation_task pot
left join production_order po on pot.production_order_id = po.id
left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
@@ -48,30 +56,31 @@
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
group by ppm.production_operation_task_id
) scrapStat on scrapStat.taskId = pot.id
+ </sql>
+
+ <sql id="groupedProductionOperationTaskWhere">
<where>
- <if test="c != null and c.id != null">
- and pot.id = #{c.id}
- </if>
- <if test="c != null and c.npsNo != null">
+ <if test="c != null and c.npsNo != null and c.npsNo != ''">
and po.nps_no like concat('%', #{c.npsNo}, '%')
</if>
<if test="c != null and c.productionOrderId != null">
and pot.production_order_id = #{c.productionOrderId}
</if>
- <if test="c != null and c.productionOrderRoutingOperationId != null">
- and pot.production_order_routing_operation_id = #{c.productionOrderRoutingOperationId}
- </if>
- <if test="c != null and c.status != null">
- and pot.status = #{c.status}
- </if>
- <if test="c != null and c.isProduction != null">
- and poro.is_production = #{c.isProduction}
- </if>
- <if test="c != null and c.workOrderNo != null and c.workOrderNo != ''">
- and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
- </if>
</where>
- order by pot.id desc
+ </sql>
+
+ <select id="pageProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
+ <include refid="groupedProductionOperationTaskSelect"/>
+ <include refid="groupedProductionOperationTaskWhere"/>
+ group by po.id
+ order by po.id desc
+ </select>
+
+ <select id="listGroupedProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
+ <include refid="groupedProductionOperationTaskSelect"/>
+ <include refid="groupedProductionOperationTaskWhere"/>
+ group by po.id, po.nps_no, po.is_end_order, p.product_name, pm.model, pm.unit
+ order by po.id desc
</select>
<select id="selectTaskStatisticsByDate" resultType="com.ruoyi.home.dto.ProductionTaskStatisticsDto">
--
Gitblit v1.9.3