From ce801368ab64803ce4dc88fcd7a401ade86e5d23 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 09 二月 2026 17:02:41 +0800
Subject: [PATCH] feat(quality): 添加不合格品处理标识字段
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 2 +-
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 5 +++++
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 1 +
src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java | 1 +
src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java | 2 ++
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 29 +++++++++++++++++++++++++++++
6 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 041d75c..e558c30 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -55,7 +55,7 @@
*/
@GetMapping("/{id}")
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java b/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
index 82e2f6d..aa5a236 100644
--- a/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
+++ b/src/main/java/com/ruoyi/quality/mapper/QualityUnqualifiedMapper.java
@@ -17,4 +17,6 @@
IPage<QualityUnqualified> qualityUnqualifiedListPage(Page page, @Param("qualityUnqualified") QualityUnqualified qualityUnqualified);
List<QualityUnqualified> qualityUnqualifiedExport(@Param("qualityUnqualified") QualityUnqualified qualityUnqualified);
+
+ QualityUnqualified getUnqualified(@Param("id") Integer id);
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index d1a019a..d2f8e88 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -138,5 +138,6 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @TableField(exist = false)
private Boolean method;
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java b/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
index 7cd7f79..ceff474 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
@@ -17,4 +17,5 @@
int deal(QualityUnqualified qualityUnqualified);
+ QualityUnqualified getUnqualified(Integer id);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index fa38ae8..932a204 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -159,4 +159,9 @@
qualityUnqualified.setInspectState(1);//宸插鐞�
return qualityUnqualifiedMapper.updateById(qualityUnqualified);
}
+
+ @Override
+ public QualityUnqualified getUnqualified(Integer id) {
+ return qualityUnqualifiedMapper.getUnqualified(id);
+ }
}
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index fd433f2..503b7b3 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -60,4 +60,33 @@
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
+ <select id="getUnqualified" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
+ SELECT
+ qu.id,
+ qu.inspect_type,
+ qu.inspect_state,
+ qu.check_time,
+ qu.check_name,
+ qu.product_id,
+ qu.product_name,
+ qu.unit,
+ qu.quantity,
+ qu.defective_phenomena,
+ qu.deal_result,
+ qu.deal_name,
+ qu.deal_time,
+ CASE
+ WHEN qu.model = pm.id THEN pm.model
+ ELSE qu.model
+ END AS model,
+ CASE
+ WHEN qu.model = pm.id THEN true
+ ELSE false
+ END AS method
+ FROM quality_unqualified qu
+ LEFT JOIN product_model pm ON qu.model = pm.id
+ where
+ 1=1
+ and qu.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3