From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
index cb6b133..2263f95 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -25,21 +25,35 @@
@SaCheckPermission("createIngredients.add")
@PostMapping("/saveMaterialStore")
public Result saveMaterialStore( @RequestBody Map<String,Object> object){
- return Result.seccess(materialStoreService.saveMaterialStore(object));
+ return Result.success(materialStoreService.saveMaterialStore(object));
}
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
@SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
- return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
+ return Result.success(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
+ }
+
+ @ApiOperation("浜у搧Bom鐗╂枡鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectIngredients.search")
+ @PostMapping("/getSelectProductBOM/{pageNum}/{pageSize}")
+ public Result getSelectProductBOM(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
+ return Result.success(materialStoreService.getSelectProductBOM(pageNum,pageSize,materialStore));
+ }
+
+ @ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectIngredients.search")
+ @PostMapping("/getSelectMaterialStore")
+ public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){
+ return Result.success(materialStoreService.getSelectMaterialStores(materialStore));
}
@ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
@SaCheckPermission("selectIngredients.delete")
@PostMapping("/deleteMaterialStore")
public Result deleteMaterialStore( @RequestBody Map<String,Object> object){
- return Result.seccess(materialStoreService.deleteMaterialStore(object));
+ return Result.success(materialStoreService.deleteMaterialStore(object));
}
--
Gitblit v1.8.0