From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 46931c0..e4c09f2 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -81,8 +81,99 @@
<if test="c.productMainId != null">
and ppm.id = #{c.productMainId}
</if>
+ <if test="c.deviceId != null">
+ and ppm.device_id = #{c.deviceId}
+ </if>
+ <if test="c.deviceName != null and c.deviceName != ''">
+ and ppm.device_name like concat('%', #{c.deviceName}, '%')
+ </if>
</where>
order by pot.work_order_no desc, poro.drag_sort, ppm.product_no desc
+ </select>
+
+ <select id="wageSummary" resultType="com.ruoyi.production.bean.vo.PieceWageSummaryVo">
+ select pa.scheduling_user_id as userId,
+ pa.scheduling_user_name as userName,
+ count(distinct pa.production_product_main_id) as workCount,
+ sum(ifnull(pa.finished_num, 0)) as quantity,
+ sum(ifnull(ppm.work_hour, 0)) as workHour,
+ sum(cast(ifnull(prc.unit_price, 0) * ifnull(pa.finished_num, 0) as decimal(18, 2))) as pieceWage,
+ sum(
+ case
+ when prc.unit_price is not null
+ then cast(ifnull(pa.finished_num, 0) * prc.unit_price as decimal(18, 2))
+ when poro.type = 0
+ then cast(ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0) as decimal(18, 2))
+ else cast(ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
+ case
+ when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
+ then cast(substring_index(pm.model, '*', -1) as decimal(18, 4))
+ else 1
+ end as decimal(18, 2))
+ end
+ ) as wages
+ from production_account pa
+ join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ 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 piece_rate_config prc on prc.product_model_id = pm.id
+ and prc.operation_name = pa.technology_operation_name
+ and prc.status = 1
+ <where>
+ <if test="startDate != null">and date(pa.scheduling_date) >= #{startDate}</if>
+ <if test="endDate != null">and date(pa.scheduling_date) <= #{endDate}</if>
+ <if test="userName != null and userName != ''">and pa.scheduling_user_name like concat('%', #{userName}, '%')</if>
+ </where>
+ group by pa.scheduling_user_id, pa.scheduling_user_name
+ order by wages desc
+ </select>
+
+ <!-- 宸ユ椂/鎶ュ簾鏄姤宸ュ崟绾ф爣閲忥紝涓�鍗曞宸ュ簭鏃剁洿鎺� sum 浼氳琛屾暟鏀惧ぇ锛屾晠鐢� rn=1 鍙湪鍏堕閬撳伐搴忚璁″叆 -->
+ <select id="outputStat" resultType="com.ruoyi.production.bean.vo.DeviceOutputStatVo">
+ select
+ t.groupName,
+ <if test="dimension == 'device'">t.groupId,</if>
+ count(distinct t.ppmId) as workCount,
+ sum(ifnull(t.finishedNum, 0)) as quantity,
+ sum(case when t.rn = 1 then ifnull(t.scrapQty, 0) else 0 end) as scrapQty,
+ sum(case when t.rn = 1 then ifnull(t.workHour, 0) else 0 end) as workHour
+ from (
+ select
+ <choose>
+ <when test="dimension == 'operation'">pa.technology_operation_name</when>
+ <when test="dimension == 'product'">concat(ifnull(p.product_name, ''), '/', ifnull(pm.model, ''))</when>
+ <otherwise>ifnull(ppm.device_name, '鏈寚瀹氳澶�')</otherwise>
+ </choose>
+ as groupName,
+ ppm.device_id as groupId,
+ ppm.id as ppmId,
+ pa.finished_num as finishedNum,
+ ppm.work_hour as workHour,
+ ppo.scrap_qty as scrapQty,
+ row_number() over (partition by ppm.id order by pa.id) as rn
+ from production_account pa
+ join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ 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 production_product_main_id, sum(ifnull(scrap_qty, 0)) as scrap_qty
+ from production_product_output
+ group by production_product_main_id
+ ) ppo on ppo.production_product_main_id = ppm.id
+ <where>
+ <if test="startDate != null">and date(pa.scheduling_date) >= #{startDate}</if>
+ <if test="endDate != null">and date(pa.scheduling_date) <= #{endDate}</if>
+ <if test="deviceId != null">and ppm.device_id = #{deviceId}</if>
+ </where>
+ ) t
+ group by t.groupName
+ <if test="dimension == 'device'">, t.groupId</if>
+ order by quantity desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
@@ -104,6 +195,7 @@
cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
cast(
case
+ when prc.unit_price is not null then ifnull(pa.finished_num, 0) * prc.unit_price
when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
case
@@ -113,7 +205,10 @@
end
end
as decimal(18,4)
- ) as wages
+ ) as wages,
+ case when prc.unit_price is not null then '璁′欢' else '璁℃椂' end as wageMode,
+ ppm.device_id as deviceId,
+ ppm.device_name as deviceName
from production_account pa
left join production_product_main ppm on ppm.id = pa.production_product_main_id
left join production_operation_task pot on ppm.production_operation_task_id = pot.id
@@ -123,6 +218,9 @@
left join product p on pm.product_id = p.id
left join product p_parent on p_parent.id = p.parent_id
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ left join piece_rate_config prc on prc.product_model_id = pm.id
+ and prc.operation_name = pa.technology_operation_name
+ and prc.status = 1
<where>
<if test="c != null">
<if test="c.productCategory != null and c.productCategory != ''">
--
Gitblit v1.9.3