From 5d25a8a01ae3070668bc60b2597591ef2ba13e5b Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:06 +0800
Subject: [PATCH] feat(薪酬核算): 全勤奖支持工资表行内调整
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 77b74b7..cf3cf9a 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -34,6 +34,14 @@
else '鏈煡'
end as auditStatusName,
pot.work_order_no as workOrderNo,
+ ifnull(pot.plan_quantity, 0) as schedulingNum,
+ cast(
+ case
+ when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) < 0 then 0
+ else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
+ end
+ as decimal(18,4)
+ ) as pendingNum,
case pot.status
when 1 then '寰呯‘璁�'
when 2 then '寰呯敓浜�'
@@ -107,7 +115,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">
@@ -131,6 +139,14 @@
else '鏈煡'
end as auditStatusName,
pot.work_order_no as workOrderNo,
+ ifnull(pot.plan_quantity, 0) as schedulingNum,
+ cast(
+ case
+ when ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0) < 0 then 0
+ else ifnull(pot.plan_quantity, 0) - ifnull(ppo.quantity, 0)
+ end
+ as decimal(18,4)
+ ) as pendingNum,
p.product_name as productName,
ifnull(p.standard_quantity, 0) as productStandardQuantity,
pm.model as productModelName,
--
Gitblit v1.9.3