From b0bbbf71d1e6ecdbe4abbcc39127f5aac6502f1e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:39:25 +0800
Subject: [PATCH] feat(production): 添加产品主记录审核功能
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 72f848f..842b872 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -51,11 +51,11 @@
<if test="c.auditStatus != null">
and ppm.audit_status = #{c.auditStatus}
</if>
- <if test="c.workOrderId != ''">
+ <if test="c.workOrderId != null">
and ppm.work_order_id = #{c.workOrderId}
</if>
</where>
- order by pwo.id desc, ppm.id asc
+ order by ppm.id desc
</select>
<select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
@@ -78,8 +78,8 @@
ppo.quantity,
slpa.work_hours,
slpa.work_hours * slpa.finished_num AS wages,
- ppm.device_name,
- ppm.device_id,
+ dl.device_name,
+ slpa.work_hour as work_minutes,
IFNULL(
TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
0
@@ -94,6 +94,7 @@
LEFT JOIN product_model pm ON po.product_model_id = pm.id
LEFT JOIN product p ON p.id = pm.product_id
LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
+ left join device_ledger dl ON dl.id = slpa.device_id
where ppm.audit_status = 1
<if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
and slpa.scheduling_user_name = #{ew.schedulingUserName}
--
Gitblit v1.9.3