From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/resources/mapper/quality/QualityInspectMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 48fb369..c2bcab9 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -4,6 +4,7 @@
<select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
qi.*,
+ pm.uid_no,
<choose>
<when test="qualityInspect.inspectType == 0">
pl.purchase_contract_number as purchase_contract_no
@@ -23,6 +24,7 @@
LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
</otherwise>
</choose>
+ 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 != '' ">
@@ -48,8 +50,10 @@
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
- *
- FROM quality_inspect
+ qi.*,
+ pm.uid_no
+ 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 != '' ">
@@ -439,6 +443,55 @@
ORDER BY rn;
</select>
+ <select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
+ select id,
+ inspect_type,
+ check_time,
+ production_date,
+ supplier,
+ customer,
+ process,
+ check_name,
+ product_id,
+ product_name,
+ model,
+ unit,
+ quantity,
+ check_company,
+ check_result,
+ create_time,
+ create_user,
+ update_time,
+ update_user,
+ tenant_id,
+ inspect_state,
+ purchase_ledger_id,
+ product_main_id,
+ defective_phenomena,
+ product_model_id,
+ test_standard_id,
+ inspected_quantity,
+
+ case
+ when inspect_material_condition = '妫�楠岀敤娑插墏鎯呭喌' then
+ '鈽�'
+ else
+ '鈽�'
+ end as inspect_material_condition_a,
+ case
+ when inspect_material_condition = '妫�楠岀敤绮夊墏鎯呭喌' then
+ '鈽�'
+ else
+ '鈽�'
+ end as inspect_material_condition_b,
+
+ validity_date,
+ manufacturing_team,
+ batch_no
+
+ from quality_inspect
+ where id = #{id};
+ </select>
</mapper>
--
Gitblit v1.9.3