From 1be8074de2176459ccea92115e4adb0704769104 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 16:43:40 +0800
Subject: [PATCH] 质量管理：提交原料后，不合格的生成不合格记录；合格则生成审批记录
---
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
index bbcdd1b..5937ffb 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -4,11 +4,14 @@
import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.RawMaterialDto;
+import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.service.RawMaterialService;
+import com.ruoyi.staff.pojo.StaffOnJob;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -56,10 +59,7 @@
*/
@PatchMapping("/submit/{id}")
public AjaxResult submit(@PathVariable Long id) {
- RawMaterial rawMaterial = new RawMaterial();
- rawMaterial.setId(id);
- rawMaterial.setInspectState(RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode());
- return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ return AjaxResult.success(rawMaterialService.submit(id));
}
/**
@@ -90,4 +90,17 @@
public AjaxResult delete(@RequestBody List<Integer> ids) {
return AjaxResult.success(rawMaterialService.removeByIds(ids));
}
+
+ /**
+ * 瀵煎嚭鍘熸枡鏁版嵁
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, RawMaterialDto rawMaterialDto) {
+ rawMaterialService.export(response, rawMaterialDto);
+ }
+
+ @PostMapping("/down")
+ public void down(HttpServletResponse response,@RequestBody RawMaterialDto rawMaterialDto) {
+ rawMaterialService.down(response, rawMaterialDto);
+ }
}
--
Gitblit v1.9.3