From a5f66f55b2c176e8504b8a077e00acfe2dfb4b00 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:56 +0800
Subject: [PATCH] feat(生产报工): 报工完成按四类区分计数零件并分流质检入库
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 2403afe..1b5dae2 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -51,6 +51,8 @@
end as workOrderStatus,
su.nick_name as nickName,
ifnull(ppo.quantity, 0) as quantity,
+ ifnull(ppo.rework_minor_qty, 0) as reworkMinorQty,
+ ifnull(ppo.rework_major_qty, 0) as reworkMajorQty,
ifnull(ppo.scrap_qty, 0) as scrapQty,
p.product_name as productName,
ifnull(p.standard_quantity, 0) as productStandardQuantity,
@@ -108,6 +110,9 @@
<if test="c.process != null and c.process != ''">
and poro.operation_name like concat('%', #{c.process}, '%')
</if>
+ <if test="c.majorCategory != null and c.majorCategory != ''">
+ and ppm.major_category = #{c.majorCategory}
+ </if>
<if test="c.schedulingDate != null">
and date(ppm.create_time) = #{c.schedulingDate}
</if>
@@ -115,7 +120,7 @@
and ppm.id = #{c.productMainId}
</if>
</where>
- order by ppm.create_time desc
+ order by ppm.product_no desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
--
Gitblit v1.9.3