From 52e93e45d7c989483693f53ded1b4483891fb055 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 14:44:28 +0800
Subject: [PATCH] feat: 物料类型与存货类别的新增、删除和修改，物料规格的导入数据
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index e95379f..184499e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -3,20 +3,17 @@
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.ProductMaterialConfigDto;
+import com.ruoyi.production.dto.ProductMaterialGroupDto;
import com.ruoyi.production.pojo.ProductMaterial;
+import com.ruoyi.production.pojo.ProductMaterialConfig;
+import com.ruoyi.production.service.ProductMaterialConfigService;
import com.ruoyi.production.service.ProductMaterialService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* <br>
@@ -34,6 +31,9 @@
@Autowired
private ProductMaterialService productMaterialService;
+ @Autowired
+ private ProductMaterialConfigService productMaterialConfigService;
+
@GetMapping("/loadData")
@ApiOperation("鎷夊彇鐗╂枡缂栫爜鏁版嵁")
@Log(title = "鎷夊彇鐗╂枡缂栫爜鏁版嵁", businessType = BusinessType.INSERT)
@@ -46,7 +46,7 @@
@ApiOperation("鐗╂枡鏁版嵁")
@Log(title = "鐗╂枡鏁版嵁", businessType = BusinessType.OTHER)
public AjaxResult productMaterialList(String materialName) {
- Map<String, List<ProductMaterial>> productMaterialMap = productMaterialService.ProductMaterialList(materialName);
+ List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(materialName);
return AjaxResult.success(productMaterialMap);
}
@@ -75,5 +75,43 @@
}
+ @GetMapping("/materialTypeList")
+ @ApiOperation("鐗╂枡绫诲瀷鏁版嵁闆嗗悎")
+ @Log(title = "鐗╂枡绫诲瀷鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
+ public AjaxResult materialTypeList() {
+ List<ProductMaterialConfig> list = productMaterialConfigService.materialTypeList();
+ return AjaxResult.success(list);
+ }
+ @GetMapping("/inventoryCategoryList")
+ @ApiOperation("'瀛樿揣绫诲埆鏁版嵁闆嗗悎")
+ @Log(title = "'瀛樿揣绫诲埆鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
+ public AjaxResult inventoryCategoryList() {
+ List<ProductMaterialConfig> list = productMaterialConfigService.inventoryCategoryList();
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/config/add")
+ @ApiOperation("鏂板鐗╂枡閰嶇疆")
+ @Log(title = "鏂板鐗╂枡閰嶇疆", businessType = BusinessType.INSERT)
+ public AjaxResult addProductMaterialConfig(@RequestBody ProductMaterialConfigDto config) {
+ productMaterialConfigService.addProductMaterialConfig(config);
+ return AjaxResult.success();
+ }
+
+ @PutMapping("/config/update")
+ @ApiOperation("淇敼鐗╂枡閰嶇疆")
+ @Log(title = "淇敼鐗╂枡閰嶇疆", businessType = BusinessType.UPDATE)
+ public AjaxResult updateProductMaterialConfig(@RequestBody ProductMaterialConfigDto config) {
+ productMaterialConfigService.updateProductMaterialConfig(config);
+ return AjaxResult.success();
+ }
+
+ @DeleteMapping("/config/delete")
+ @ApiOperation("鍒犻櫎鐗╂枡閰嶇疆")
+ @Log(title = "鍒犻櫎鐗╂枡閰嶇疆", businessType = BusinessType.DELETE)
+ public AjaxResult deleteProductMaterialConfig(@RequestBody List<Integer> ids) {
+ productMaterialConfigService.deleteProductMaterialConfig(ids);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.9.3