From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示

---
 src/main/java/com/ruoyi/quality/controller/RawMaterialController.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 2 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..b5939be 100644
--- a/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
+++ b/src/main/java/com/ruoyi/quality/controller/RawMaterialController.java
@@ -1,12 +1,22 @@
 package com.ruoyi.quality.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.quality.dto.RawMaterialDto;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.pojo.RawMaterial;
+import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
 import com.ruoyi.quality.service.RawMaterialService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -23,6 +33,12 @@
     @Resource
     private RawMaterialService rawMaterialService;
 
+    @Resource
+    private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;
+
+    @Resource
+    private IQualityInspectFileService qualityInspectFileService;
+
     /**
      * 鍘熸枡鍒嗛〉鏌ヨ
      */
@@ -31,6 +47,13 @@
         return AjaxResult.success(rawMaterialService.listPage(page, rawMaterialDto));
     }
 
+    /**
+     * 鍘熸枡璇︽儏
+     */
+    @GetMapping("/detail/{id}")
+    public AjaxResult detail(@PathVariable Long id) {
+        return AjaxResult.success(rawMaterialService.detail(id));
+    }
 
     /**
      * 鍘熸枡鏂板
@@ -41,18 +64,66 @@
     }
 
     /**
+     * 妫�娴嬫彁浜�
+     * @param id 鍘熸枡id
+     * @return
+     */
+    @PatchMapping("/submit/{id}")
+    public AjaxResult submit(@PathVariable Long id) {
+        return AjaxResult.success(rawMaterialService.submit(id));
+    }
+
+    /**
+     * 淇敼妫�楠屼汉
+     * @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));
     }
 
     /**
      * 鍘熸枡鍒犻櫎
      */
     @DeleteMapping("")
+    @PreAuthorize("@ss.hasPermi('raw_cancel')")
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult delete(@RequestBody List<Integer> ids) {
-        return AjaxResult.success(rawMaterialService.removeByIds(ids));
+        if(CollectionUtils.isEmpty(ids)){
+            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        //鍒犻櫎妫�楠屽弬鏁�
+        rawMaterialQualityInspectItemService.remove(Wrappers.<RawMaterialQualityInspectItem>lambdaQuery()
+                .in(RawMaterialQualityInspectItem::getRawMaterialId,ids));
+        //鍒犻櫎妫�楠岄檮浠�
+        qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
+                .in(QualityInspectFile::getInspectId,ids));
+        //鍒犻櫎妫�楠屽崟
+        return AjaxResult.success(rawMaterialService.removeBatchByIds(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