From cea4e4e9c6dad4d4f1b04b750ffca73cc252b22f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 10:23:00 +0800
Subject: [PATCH] 生产工单流转卡去掉logo，增加产品单位
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index c271bc9..6f038d3 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,17 +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
@@ -22,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>
@@ -50,8 +54,10 @@
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
*,
+ pm.material_code as materialCode,
(quantity - defective_quantity) as qualifiedQuantity
- FROM quality_inspect
+ 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