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/ProductionProductMainMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 5a78a5b..77d6495 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -7,6 +7,9 @@
<id column="id" property="id" />
<result column="product_no" property="productNo" />
<result column="production_operation_task_id" property="productionOperationTaskId" />
+ <result column="report_type" property="reportType" />
+ <result column="audit_status" property="auditStatus" />
+ <result column="audit_remark" property="auditRemark" />
<result column="dept_id" property="deptId" />
<result column="update_time" property="updateTime" />
<result column="create_user" property="createUser" />
@@ -16,6 +19,20 @@
<select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
select ppm.*,
+ ppm.product_no as reportNo,
+ case ppm.report_type
+ when 0 then '鍚堟牸'
+ when 1 then '杞诲井杩斿伐'
+ when 2 then '涓ラ噸杩斿伐'
+ when 3 then '鎶ュ簾'
+ else '鏈煡'
+ end as reportTypeName,
+ case ppm.audit_status
+ when 0 then '寰呭鏍�'
+ when 1 then '瀹℃牳閫氳繃'
+ when 2 then '瀹℃牳涓嶉�氳繃'
+ else '鏈煡'
+ end as auditStatusName,
pot.work_order_no as workOrderNo,
case pot.status
when 1 then '寰呯‘璁�'
@@ -57,6 +74,12 @@
<if test="c.productNo != null and c.productNo != ''">
and ppm.product_no like concat('%', #{c.productNo}, '%')
</if>
+ <if test="c.auditStatus != null">
+ and ppm.audit_status = #{c.auditStatus}
+ </if>
+ <if test="c.reportType != null">
+ and ppm.report_type = #{c.reportType}
+ </if>
<if test="c.workOrderNo != null and c.workOrderNo != ''">
and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
</if>
@@ -91,6 +114,20 @@
<select id="listProductionDetails" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
select ppm.*,
+ ppm.product_no as reportNo,
+ case ppm.report_type
+ when 0 then '鍚堟牸'
+ when 1 then '杞诲井杩斿伐'
+ when 2 then '涓ラ噸杩斿伐'
+ when 3 then '鎶ュ簾'
+ else '鏈煡'
+ end as reportTypeName,
+ case ppm.audit_status
+ when 0 then '寰呭鏍�'
+ when 1 then '瀹℃牳閫氳繃'
+ when 2 then '瀹℃牳涓嶉�氳繃'
+ else '鏈煡'
+ end as auditStatusName,
pot.work_order_no as workOrderNo,
p.product_name as productName,
pm.model as productModelName,
@@ -99,14 +136,22 @@
ifnull(ppo.quantity, 0) as quantity,
ifnull(ppo.scrap_qty, 0) as scrapQty,
date(pa.scheduling_date) as schedulingDate,
+ pa.scheduling_user_id as schedulingUserId,
pa.scheduling_user_name as schedulingUserName,
+ cast(ifnull(ppm.work_hour, 0) as decimal(18,4)) as workHour,
cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
+ cast(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
+ pa.adjust_remark as adjustRemark,
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
+ 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
@@ -121,6 +166,12 @@
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
<where>
<if test="c != null">
+ <if test="c.auditStatus != null">
+ and ppm.audit_status = #{c.auditStatus}
+ </if>
+ <if test="c.reportType != null">
+ and ppm.report_type = #{c.reportType}
+ </if>
<if test="c.productCategory != null and c.productCategory != ''">
and p_parent.product_name like concat('%', #{c.productCategory}, '%')
</if>
--
Gitblit v1.9.3