From 8ec375a6fab78e088b3c05e550c0581c9c57152e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 三月 2026 15:31:37 +0800
Subject: [PATCH] 原料检测
---
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
index d3e0a38..bbcdd1b 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,8 +1,10 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.dto.RawMaterialDto;
+import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.service.RawMaterialService;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +33,13 @@
return AjaxResult.success(rawMaterialService.listPage(page, rawMaterialDto));
}
+ /**
+ * 鍘熸枡璇︽儏
+ */
+ @GetMapping("/detail/{id}")
+ public AjaxResult detail(@PathVariable Long id) {
+ return AjaxResult.success(rawMaterialService.detail(id));
+ }
/**
* 鍘熸枡鏂板
@@ -41,11 +50,37 @@
}
/**
+ * 妫�娴嬫彁浜�
+ * @param id 鍘熸枡id
+ * @return
+ */
+ @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));
+ }
+
+ /**
+ * 淇敼妫�楠屼汉
+ * @param rawMaterialDto 鍘熸枡
+ * @return
+ */
+ @PatchMapping("/updateCheckUserName")
+ public AjaxResult updateCheckUserName(@RequestBody RawMaterialDto rawMaterialDto) {
+ RawMaterial rawMaterial = new RawMaterial();
+ rawMaterial.setId(rawMaterialDto.getId());
+ rawMaterial.setCheckUserName(rawMaterialDto.getCheckUserName());
+ return AjaxResult.success(rawMaterialService.updateById(rawMaterial));
+ }
+
+ /**
* 鍘熸枡鏇存柊
*/
@PutMapping("")
public AjaxResult update(@RequestBody RawMaterialDto rawMaterialDto) {
- return AjaxResult.success(rawMaterialService.updateById(rawMaterialDto));
+ return AjaxResult.success(rawMaterialService.update(rawMaterialDto));
}
/**
--
Gitblit v1.9.3