From d3475019350136c3946afcb3a831a5444e97bc17 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 29 三月 2024 09:59:02 +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/MaterialInventoryController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
index 7d8b272..711ffaa 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -3,10 +3,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
-import com.example.erp.entity.mm.MaterialInventory;
-import com.example.erp.entity.mm.MaterialOutbound;
-import com.example.erp.entity.mm.MaterialOutboundDetail;
-import com.example.erp.entity.mm.MaterialStore;
+import com.example.erp.entity.mm.*;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.mm.MaterialInventoryService;
import com.example.erp.service.mm.MaterialStoreService;
@@ -71,7 +68,7 @@
return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
}
- @ApiOperation("鏉愭枡鍑哄簱淇敼鎺ュ彛")
+ @ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
@PostMapping("/updateMaterialOutboundToExamine")
public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
if(materialInventoryService.updateMaterialOutboundToExamine(object)){
@@ -96,6 +93,42 @@
}
}
+ @ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
+ @PostMapping("/saveReturningWarehouse")
+ public Result saveReturningWarehouse( @RequestBody Map<String,Object> object){
+ if(materialInventoryService.saveReturningWarehouse(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
+ public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
+ return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
+ }
+
+ @ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
+ @PostMapping("/updateReturningWarehouseToExamine")
+ public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
+ if(materialInventoryService.updateReturningWarehouseToExamine(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+
+ }
+ }
+
+
+ @ApiOperation("鐗╂枡杩斿簱鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
+ return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
+ }
+
--
Gitblit v1.8.0