From 53c0da6e44a01acf9d97bdc7abaf25e5984b92dc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 13 七月 2026 14:39:57 +0800
Subject: [PATCH] 修改生产核算
---
src/main/resources/mapper/production/ProductionAccountMapper.xml | 132 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 126 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionAccountMapper.xml b/src/main/resources/mapper/production/ProductionAccountMapper.xml
index 8b669e9..fd439de 100644
--- a/src/main/resources/mapper/production/ProductionAccountMapper.xml
+++ b/src/main/resources/mapper/production/ProductionAccountMapper.xml
@@ -13,6 +13,11 @@
<result column="finished_num" property="finishedNum" />
<result column="work_hours" property="workHours" />
<result column="technology_operation_name" property="technologyOperationName" />
+ <result column="adjust_amount" property="adjustAmount" />
+ <result column="adjust_remark" property="adjustRemark" />
+ <result column="adjust_user" property="adjustUser" />
+ <result column="adjust_time" property="adjustTime" />
+ <result column="accounting_batch_no" property="accountingBatchNo" />
<result column="scheduling_date" property="schedulingDate" />
<result column="create_user" property="createUser" />
<result column="create_time" property="createTime" />
@@ -21,12 +26,124 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionAccountVo">
+ select
+ group_concat(distinct ppm.product_no order by ppm.product_no separator ',') as reportNo,
+ case
+ when sum(case when ppm.audit_status = 0 then 1 else 0 end) > 0 then '寰呭鏍�'
+ when sum(case when ppm.audit_status = 2 then 1 else 0 end) > 0 then '瀹℃牳涓嶉�氳繃'
+ else '瀹℃牳閫氳繃'
+ end as auditStatusName,
+ case
+ when sum(case when ppm.report_type = 1 then 1 else 0 end) > 0 then '杞诲井杩斿伐'
+ when sum(case when ppm.report_type = 2 then 1 else 0 end) > 0 then '涓ラ噸杩斿伐'
+ when sum(case when ppm.report_type = 3 then 1 else 0 end) > 0 then '鎶ュ簾'
+ else '鍚堟牸'
+ end as reportTypeName,
+ group_concat(distinct p_parent.product_name order by p_parent.product_name separator ',') as productCategory,
+ group_concat(distinct pm.model order by pm.model separator ',') as specificationModel,
+ group_concat(distinct pm.unit order by pm.unit separator ',') as unit,
+ pa.scheduling_user_id as schedulingUserId,
+ pa.scheduling_user_name as schedulingUserName,
+ group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
+ cast(sum(
+ case
+ when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
+ 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
+ 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
+ end
+ ) as decimal(18,4)) as wages,
+ cast(sum(ifnull(pa.finished_num, 0)) as decimal(18,4)) as finishedNum,
+ cast(sum(ifnull(pa.work_hours, 0)) as decimal(18,4)) as workHours,
+ cast(sum(ifnull(pa.adjust_amount, 0)) as decimal(18,4)) as adjustAmount,
+ cast(sum(ifnull(ppm.work_hour, 0)) as decimal(18,4)) as workHour,
+ case
+ when sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) = 0 then '0%'
+ else concat(
+ cast(
+ round(
+ sum(ifnull(ppo.quantity, 0)) /
+ sum(ifnull(ppo.quantity, 0) + ifnull(ppo.scrapQty, 0)) * 100, 2
+ ) as char
+ ),
+ '%'
+ )
+ end as outputRate,
+ group_concat(distinct pa.technology_operation_name order by pa.technology_operation_name separator ',') as process,
+ group_concat(distinct pa.adjust_remark order by pa.adjust_time desc separator ',') as adjustRemark,
+ case
+ when count(distinct date(pa.scheduling_date)) = 1 then min(date(pa.scheduling_date))
+ else null
+ end as schedulingDate,
+ case
+ when count(distinct date_format(pa.scheduling_date, '%Y-%m')) = 1 then min(date_format(pa.scheduling_date, '%Y-%m'))
+ else null
+ end as schedulingMonth
+ 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
+ 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 product p_parent on p_parent.id = p.parent_id
+ left join (
+ select production_product_main_id,
+ cast(sum(ifnull(quantity, 0)) as decimal(18,4)) as quantity,
+ cast(sum(ifnull(scrap_qty, 0)) as decimal(18,4)) as scrapQty
+ from production_product_output
+ group by production_product_main_id
+ ) ppo on ppo.production_product_main_id = ppm.id
+ <where>
+ and ppm.audit_status = 1
+ and ppm.report_type = 0
+ <if test="c != null">
+ <if test="c.productCategory != null and c.productCategory != ''">
+ and p_parent.product_name like concat('%', #{c.productCategory}, '%')
+ </if>
+ <if test="c.specificationModel != null and c.specificationModel != ''">
+ and pm.model like concat('%', #{c.specificationModel}, '%')
+ </if>
+ <if test="c.schedulingUserId != null">
+ and pa.scheduling_user_id = #{c.schedulingUserId}
+ </if>
+ <if test="c.schedulingUserName != null and c.schedulingUserName != ''">
+ and pa.scheduling_user_name like concat('%', #{c.schedulingUserName}, '%')
+ </if>
+ <if test="c.process != null and c.process != ''">
+ and pa.technology_operation_name like concat('%', #{c.process}, '%')
+ </if>
+ <if test="c.entryDate != null">
+ and date(pa.scheduling_date) = #{c.entryDate}
+ </if>
+ <if test="c.entryDateStart != null">
+ and date(pa.scheduling_date) >= #{c.entryDateStart}
+ </if>
+ <if test="c.entryDateEnd != null">
+ and date(pa.scheduling_date) <= #{c.entryDateEnd}
+ </if>
+ </if>
+ </where>
+ group by pa.scheduling_user_id,
+ pa.scheduling_user_name
+ order by wages desc,
+ pa.scheduling_user_id asc
+ </select>
+
<select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
select ifnull(sum(finished_num), 0) as accountBalance,
ifnull(sum(work_hours), 0) as account
- from production_account
- where scheduling_user_id = #{userId}
- and date_format(scheduling_date, '%Y-%m') = #{date}
+ from production_account pa
+ inner join production_product_main ppm on ppm.id = pa.production_product_main_id
+ where pa.scheduling_user_id = #{userId}
+ and date_format(pa.scheduling_date, '%Y-%m') = #{date}
+ and ppm.audit_status = 1
+ and ppm.report_type = 0
</select>
<select id="selectDailyWagesStats" resultType="java.util.Map">
@@ -34,9 +151,12 @@
cast(ifnull(sum(finished_num), 0) as decimal(18,2)) as numberOfCompleted,
cast(ifnull(sum(work_hours), 0) as decimal(18,2)) as amount,
cast(0 as decimal(18,2)) as passRate
- from production_account
- where scheduling_date >= #{startDate}
- and scheduling_date <= #{endDate}
+ from production_account pa
+ inner join production_product_main ppm on ppm.id = pa.production_product_main_id
+ where pa.scheduling_date >= #{startDate}
+ and pa.scheduling_date <= #{endDate}
+ and ppm.audit_status = 1
+ and ppm.report_type = 0
group by date_format(scheduling_date, '%m-%d')
order by date_format(scheduling_date, '%m-%d')
</select>
--
Gitblit v1.9.3