From 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 16 三月 2026 14:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/quality/controller/RawMaterialController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 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..92f13f1 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,12 +1,17 @@
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.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;
/**
@@ -31,6 +36,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 +53,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));
}
/**
@@ -55,4 +93,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