From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +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 | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
similarity index 66%
rename from north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialController.java
rename to north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
index 912d9e8..2dd9e67 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -3,34 +3,27 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
-import com.example.erp.entity.mm.FinishedGoodsInventory;
-import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.mm.MaterialStore;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.Customer;
-import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
-import com.example.erp.service.mm.FinishedGoodsInventoryService;
-import com.example.erp.service.mm.MaterialService;
+import com.example.erp.service.mm.MaterialStoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
import java.util.Map;
@RestController
-@RequestMapping("/Material")
+@RequestMapping("/MaterialStore")
@Api(value="鐗╂枡controller",tags={"鐗╂枡鎿嶄綔鎺ュ彛"})
-public class MaterialController {
+public class MaterialStoreController {
@Autowired
- MaterialService faterialService;
+ MaterialStoreService materialStoreService;
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
@PostMapping("/saveMaterialStore")
public Result saveMaterialStore( @RequestBody Map<String,Object> object){
- if(faterialService.saveMaterialStore(object)){
+ if(materialStoreService.saveMaterialStore(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -41,13 +34,13 @@
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
@PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
- return Result.seccess(faterialService.getSelectMaterialStore(pageNum,pageSize,materialStore));
+ return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
}
@ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
@PostMapping("/deleteMaterialStore")
public Result deleteMaterialStore( @RequestBody Map<String,Object> object){
- if(faterialService.deleteMaterialStore(object)){
+ if(materialStoreService.deleteMaterialStore(object)){
return Result.seccess();
--
Gitblit v1.8.0