From 84ee50f83144da18e7eb42bb8577aa17f717e7fa Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 18 三月 2026 09:23:00 +0800
Subject: [PATCH] 不合格管理：取消隔离
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 9 +++++++++
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 16 ++++++++++++++++
src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java | 2 ++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index e558c30..92ec2ba 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -100,4 +100,13 @@
}
+ /**
+ * 鍙栨秷闅旂
+ * @param qualityUnqualified
+ * @return
+ */
+ @PostMapping("/liftTheQuarantine")
+ public AjaxResult liftTheQuarantine(QualityUnqualified qualityUnqualified) {
+ return AjaxResult.success(qualityUnqualifiedService.liftTheQuarantine(qualityUnqualified));
+ }
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java b/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
index ceff474..bfad083 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityUnqualifiedService.java
@@ -17,5 +17,7 @@
int deal(QualityUnqualified qualityUnqualified);
+ boolean liftTheQuarantine(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 c1fdff7..b012316 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -170,6 +170,22 @@
}
@Override
+ public boolean liftTheQuarantine(QualityUnqualified qualityUnqualified) {
+ if (qualityUnqualified.getDealResult().equals("闅旂")) {
+ throw new RuntimeException("璇ヤ笉鍚堟牸鍝佹湭琚殧绂�");
+ }
+
+ // 鍙栨秷闅旂 璋冪敤鎻愪氦鍚堟牸鐨勬帴鍙�
+ QualityInspect qualityInspect = qualityInspectService.getById(qualityUnqualified.getInspectId());
+ if (qualityInspect.getInspectType().equals(2)) {
+ stockUtils.addStockNoReview(qualityInspect.getProductModelId(), qualityUnqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), qualityUnqualified.getId());
+ } else {
+ stockUtils.addStock(qualityInspect.getProductModelId(), qualityUnqualified.getQuantity(), StockInQualifiedRecordTypeEnum.DEFECTIVE_PASS.getCode(), qualityUnqualified.getId());
+ }
+ return true;
+ }
+
+ @Override
public QualityUnqualified getUnqualified(Integer id) {
return qualityUnqualifiedMapper.getUnqualified(id);
}
--
Gitblit v1.9.3