From 86be28dd91854ff36dbc88d40a79efcb9b7229a6 Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期日, 07 四月 2024 09:42:41 +0800 Subject: [PATCH] 提交物料模块修改 --- north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 711ffaa..bc35d70 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 @@ -4,6 +4,7 @@ import com.example.erp.common.Constants; import com.example.erp.common.Result; import com.example.erp.entity.mm.*; +import com.example.erp.entity.pp.OptimizeUse; import com.example.erp.exception.ServiceException; import com.example.erp.service.mm.MaterialInventoryService; import com.example.erp.service.mm.MaterialStoreService; @@ -50,10 +51,22 @@ return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory)); } + @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�") + @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}") + public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){ + return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory)); + } + @ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛") @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}") public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){ return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory)); + } + + @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛") + @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}") + public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){ + return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse)); } @ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛") @@ -68,6 +81,7 @@ return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail)); } + @ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛") @PostMapping("/updateMaterialOutboundToExamine") public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){ -- Gitblit v1.8.0