From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48fb369..6f038d3 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,16 +4,20 @@
<select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
qi.*,
+ pm.material_code as materialCode,
+ (qi.quantity - qi.defective_quantity) as qualifiedQuantity,
<choose>
<when test="qualityInspect.inspectType == 0">
pl.purchase_contract_number as purchase_contract_no
</when>
<otherwise>
- pwo.work_order_no
+ pwo.work_order_no,
+ po.batch_no
</otherwise>
</choose>
FROM
quality_inspect qi
+ LEFT JOIN product_model pm ON qi.product_model_id = pm.id
<choose>
<when test="qualityInspect.inspectType == 0 ">
LEFT JOIN purchase_ledger pl ON pl.id = qi.purchase_ledger_id
@@ -21,10 +25,11 @@
<otherwise>
LEFT JOIN production_product_main ppm ON qi.product_main_id = ppm.id
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
+ LEFT JOIN product_order po ON pwo.product_order_id = po.id
</otherwise>
</choose>
WHERE
- inspect_type=#{qualityInspect.inspectType}
+ inspect_type = #{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
AND qi.supplier like concat('%',#{qualityInspect.supplier},'%')
</if>
@@ -48,8 +53,11 @@
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
- *
- FROM quality_inspect
+ *,
+ pm.material_code as materialCode,
+ (quantity - defective_quantity) as qualifiedQuantity
+ FROM quality_inspect qi
+ LEFT JOIN product_model pm ON qi.product_model_id = pm.id
where
inspect_type=#{qualityInspect.inspectType}
<if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
--
Gitblit v1.9.3