From 2c19f00b211b7ffb1a265d67991d92f2b194b1f5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 08 六月 2026 11:33:47 +0800
Subject: [PATCH] feat(financial): 新增凭证分录科目明细字段
---
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml | 154 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 129 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index ebafa7a..bcaf4f1 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -21,41 +21,66 @@
<result column="dept_id" property="deptId" />
</resultMap>
- <select id="pageProductionOperationTask" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
- select pot.*,
- po.nps_no as npsNo,
- p.product_name as productName,
- pm.model as model,
- pm.unit as unit,
- poro.operation_name as operationName,
- ROUND(pot.complete_quantity / pot.plan_quantity * 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
left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
left join product p on pm.product_id = p.id
+ left join (
+ select ppm.production_operation_task_id as taskId,
+ sum(ifnull(ppo.scrap_qty, 0)) as scrapQty
+ from production_product_main ppm
+ 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 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.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">
@@ -94,7 +119,7 @@
select poro.operation_name as processName,
sum(ifnull(ppi.input_quantity, 0)) as totalInput,
sum(ifnull(ppo.scrap_qty, 0)) as totalScrap,
- sum(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0)) as totalOutput
+ sum(greatest(ifnull(ppo.quantity, 0) - ifnull(ppo.scrap_qty, 0), 0)) as totalOutput
from production_product_output ppo
inner join production_product_main ppm on ppo.production_product_main_id = ppm.id
inner join production_operation_task pot on ppm.production_operation_task_id = pot.id
@@ -120,4 +145,83 @@
group by poro.technology_operation_id, poro.operation_name
</select>
+ <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.bean.dto.ProductionOperationTaskDto">
+ SELECT pot.*,
+ poro.operation_name AS processName,
+ pm.model AS model,
+ pm.unit AS unit,
+ p.product_name AS productName,
+ po.nps_no AS productOrderNpsNo,
+ ROUND(IFNULL(pot.complete_quantity, 0) / NULLIF(pot.plan_quantity, 0) * 100, 2) AS completionStatus,
+ IFNULL(scrapStat.scrapQty, 0) AS scrapQty
+ 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
+ LEFT JOIN product_model pm ON pm.id = ifnull(poro.product_model_id, po.product_model_id)
+ LEFT JOIN product p ON p.id = pm.product_id
+ LEFT JOIN (
+ SELECT ppm.production_operation_task_id AS taskId,
+ SUM(IFNULL(ppo.scrap_qty, 0)) AS scrapQty
+ FROM production_product_main ppm
+ 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
+ WHERE pot.id = #{id}
+ </select>
+
+ <select id="getOperation" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
+ select poro.operation_name as operationName,
+ max(poro.type) as type,
+ count(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(outputStat.scrapQty, 0)) as scrapQty,
+ round(
+ case
+ when sum(ifnull(pot.plan_quantity, 0)) = 0 then 0
+ else (sum(ifnull(pot.complete_quantity, 0)) + sum(ifnull(outputStat.scrapQty, 0)))
+ / sum(ifnull(pot.plan_quantity, 0)) * 100
+ end,
+ 2
+ ) as completionStatus
+ from production_operation_task pot
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join (
+ select ppm.production_operation_task_id as taskId,
+ sum(ifnull(ppo.scrap_qty, 0)) as scrapQty
+ from production_product_main ppm
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ group by ppm.production_operation_task_id
+ ) outputStat on outputStat.taskId = pot.id
+ <where>
+ <if test="c != null and c.startDate != null">
+ and date(pot.create_time) >= #{c.startDate}
+ </if>
+ <if test="c != null and c.endDate != null">
+ and date(pot.create_time) <= #{c.endDate}
+ </if>
+ <if test="c != null and c.planStartTime != null">
+ and pot.plan_start_time >= #{c.planStartTime}
+ </if>
+ <if test="c != null and c.planEndTime != null">
+ and pot.plan_end_time <= #{c.planEndTime}
+ </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.processName != null and c.processName != ''">
+ and poro.operation_name like concat('%', #{c.processName}, '%')
+ </if>
+ </where>
+ group by poro.operation_name
+ order by min(poro.drag_sort), poro.operation_name
+ </select>
+
</mapper>
--
Gitblit v1.9.3