From 5a44cc19254b49329c33bbe82446764cdcc6a7d5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 03 四月 2026 09:14:49 +0800
Subject: [PATCH] 质检新增检验用粉剂/液ID及规格型号ID
---
src/main/resources/static/out-report-template.docx | 0
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 10 ++++++++++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 12 ++++++------
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 17d7893..0758cd2 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -123,6 +123,16 @@
private String inspectMaterialCondition;
/**
+ * 妫�楠岀敤绮夊墏/娑叉儏鍐� 浜у搧ID
+ */
+ private Long inspectMaterialConditionId;
+
+ /**
+ * 妫�楠岀敤绮夊墏/娑茶鏍煎瀷鍙稩Da
+ */
+ private Long inspectProductModelId;
+
+ /**
* 鏈夋晥鏈燂紙璁＄畻瀛楁锛氱敓浜ф棩鏈�+鏈夋晥鏈燂級
*/
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index e8494eb..63548cb 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -446,16 +446,16 @@
<select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
select *,
case
- when inspect_material_condition = '妫�楠岀敤娑插墏鎯呭喌' then
- '鈽�'
- else
+ when inspect_material_condition = '妫�楠岀敤绮夊墏' then
'鈽�'
+ else
+ '鈽�'
end as inspect_material_condition_a,
case
- when inspect_material_condition = '妫�楠岀敤绮夊墏鎯呭喌' then
- '鈽�'
- else
+ when inspect_material_condition = '妫�楠岀敤娑插墏' then
'鈽�'
+ else
+ '鈽�'
end as inspect_material_condition_b
from quality_inspect
where id = #{id};
diff --git a/src/main/resources/static/out-report-template.docx b/src/main/resources/static/out-report-template.docx
index ef9b018..8dd6c44 100644
--- a/src/main/resources/static/out-report-template.docx
+++ b/src/main/resources/static/out-report-template.docx
Binary files differ
--
Gitblit v1.9.3