From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/production/controller/ProductBomController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductBomController.java b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
index b6c9bce..79eb6e0 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductBomController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.dto.BomImportDto;
import com.ruoyi.production.dto.ProductBomDto;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductBom;
@@ -19,6 +21,7 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -66,11 +69,18 @@
return productBomService.add(productBom);
}
+ @ApiModelProperty("澶嶅埗BOM")
+ @PostMapping("/copy")
+ @Log(title = "澶嶅埗BOM", businessType = BusinessType.INSERT)
+ public AjaxResult copy(@RequestBody ProductBomDto productBom) {
+ return productBomService.copy(productBom);
+ }
+
@ApiOperation("鏇存柊BOM")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
@PutMapping("/update")
public AjaxResult update(@RequestBody ProductBom productBom) {
- return AjaxResult.success(productBomService.updateById(productBom));
+ return AjaxResult.success(productBomService.update(productBom));
}
@ApiOperation("鍒犻櫎BOM")
@@ -100,6 +110,7 @@
@PostMapping("uploadBom")
+ @PreAuthorize("@ss.hasPermi('product:bom:import')")
@Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
@ApiOperation("鏍规嵁Excel瀵煎叆BOM")
public AjaxResult uploadBom(@RequestParam("file") MultipartFile file) {
@@ -107,9 +118,18 @@
}
@PostMapping("exportBom")
- @Log(title = "瀵煎嚭BOM鏂囦欢", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('product:bom:export')")
@ApiOperation("瀵煎嚭BOM鏂囦欢")
+ @Log(title = "瀵煎嚭BOM鏂囦欢", businessType = BusinessType.EXPORT)
public void exportBom(HttpServletResponse response, @RequestParam Integer bomId) {
productBomService.exportBom(response, bomId);
}
+
+ @GetMapping("/downloadTemplate")
+ @Log(title = "涓嬭浇BOM瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
+ @ApiOperation("涓嬭浇BOM瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) {
+ ExcelUtil<BomImportDto> excelUtil = new ExcelUtil<>(BomImportDto.class);
+ excelUtil.importTemplateExcel(response, "BOM瀵煎叆妯℃澘");
+ }
}
--
Gitblit v1.9.3