From d5055b7870d0406f9b00d429cb47d2bfb79b902c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 十二月 2025 11:37:09 +0800
Subject: [PATCH] 补片流程卡添加打印次数
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 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 02ccdce..2ef836c 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
@@ -5,6 +5,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.mm.MaterialLogDTO;
import com.example.erp.entity.mm.*;
import com.example.erp.entity.pp.OptimizeUse;
import com.example.erp.exception.ServiceException;
@@ -34,7 +35,7 @@
@PostMapping("/saveMaterialOutbound")
public Result saveMaterialOutbound( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.saveMaterialOutbound(object));
+ return Result.success(materialInventoryService.saveMaterialOutbound(object));
}
@@ -42,49 +43,50 @@
@SaCheckPermission("selectIngredientsStock.add")
@PostMapping("/saveMaterialInventory")
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.saveMaterialInventory(object));
+ return Result.success(materialInventoryService.saveMaterialInventory(object));
}
+
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
@SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
- return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
+ return Result.success(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�")
@SaCheckPermission("selectIngredientsStock.search")
@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));
+ return Result.success(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛")
@SaCheckPermission("createOutbound.search")
@PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
- return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
+ return Result.success(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛")
@SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
- return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
+ return Result.success(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
}
@ApiOperation("鏉愭枡鍑哄簱鍔犳椂闂存煡璇㈡帴鍙�")
@SaCheckPermission("materialOutbound.search")
@PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
- return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
+ return Result.success(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
}
@ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
@SaCheckPermission("createOutbound.search")
@PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
- return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
+ return Result.success(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
}
@@ -92,42 +94,42 @@
@SaCheckPermission("createOutbound.review")
@PostMapping("/updateMaterialOutboundToExamine")
public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
+ return Result.success(materialInventoryService.updateMaterialOutboundToExamine(object));
}
@ApiOperation("鏉愭枡鍑哄簱鍒犻櫎鎺ュ彛")
@SaCheckPermission("materialOutbound.delete")
@PostMapping("/deleteMaterialOutbound")
public Result deleteMaterialOutbound( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
+ return Result.success(materialInventoryService.deleteMaterialOutbound(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.add")
@PostMapping("/saveReturningWarehouse")
public Result saveReturningWarehouse( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
+ return Result.success(materialInventoryService.saveReturningWarehouse(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.search")
@PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
- return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
+ return Result.success(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
}
@ApiOperation("鐗╂枡杩斿簱鍒犻櫎鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.delete")
@PostMapping("/deleteReturnToStorage")
public Result deleteReturnToStorage( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.deleteReturnToStorage(object));
+ return Result.success(materialInventoryService.deleteReturnToStorage(object));
}
@ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
@SaCheckPermission("returnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
+ return Result.success(materialInventoryService.updateReturningWarehouseToExamine(object));
}
@@ -135,7 +137,7 @@
@SaCheckPermission("returnToStorage.search")
@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));
+ return Result.success(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
}
@@ -143,62 +145,84 @@
@SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
- return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
+ return Result.success(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
}
@ApiOperation("浣欐枡鏂板鎺ュ彛")
@SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/addSelectSurplusMaterialsDate")
public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
+ return Result.success(materialInventoryService.addSelectSurplusMaterialsDate(object));
}
@ApiOperation("鐗╂枡鍑哄簱鎵撳嵃鎺ュ彛")
@SaCheckPermission("selectIngredientsStock.search")
@GetMapping ("/printCreateOutbound/{materialOutboundId}")
public Result printCreateOutbound(@PathVariable String materialOutboundId) {
- return Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
+ return Result.success(materialInventoryService.printCreateOutbound(materialOutboundId));
}
@ApiOperation("鐗╂枡搴撳瓨璁板綍鏌ヨ鎺ュ彛")
@SaCheckPermission("warehouseReport.search")
@PostMapping("/getMaterialLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
public Result getMaterialLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
- return Result.seccess(materialInventoryService.getMaterialLogReport(type,pageNum,pageSize,selectDate,materialLog));
+ return Result.success(materialInventoryService.getMaterialLogReport(type,pageNum,pageSize,selectDate,materialLog));
}
@ApiOperation("鐗╂枡搴撳瓨鍒犻櫎")
@SaCheckPermission("createOutbound.search")
@PostMapping("/deleteMaterialInventory")
public Result deleteMaterialInventory(@RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.deleteMaterialInventory(object));
+ return Result.success(materialInventoryService.deleteMaterialInventory(object));
}
@ApiOperation("鐗╂枡鎶ヨ〃瀵煎嚭")
@PostMapping("/exportMaterialLogReport/{type}")
public void exportMaterialLogReport(@PathVariable String type, HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
- DownExcel.download(response, MaterialLog.class, materialInventoryService.exportMaterialLogReport(dates,type),"orderReport");
+ DownExcel.download(response, MaterialLogDTO.class, materialInventoryService.exportMaterialLogReport(dates,type),"orderReport");
}
@ApiOperation("mes鍒囧壊鎶ュ伐")
@PostMapping ("/mesMaterialOutbound")
public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork) {
- return Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
+ return Result.success(materialInventoryService.mesMaterialOutbound(reportingWork));
+ }
+
+ @ApiOperation("mes鍘熺墖鏌ヨ")
+ @PostMapping ("/mesOriginalSelect")
+ public Result mesOriginalSelect() {
+ return Result.success(materialInventoryService.mesOriginalSelect());
}
@ApiOperation("鐗╂枡鏂板杩斿洖鎺ュ彛")
@PostMapping("/cancelMaterialAdditionRecord")
public Result cancelMaterialAdditionRecord( @RequestBody Map<String,Object> object){
- return Result.seccess(materialInventoryService.cancelMaterialAdditionRecord(object));
+ return Result.success(materialInventoryService.cancelMaterialAdditionRecord(object));
}
@ApiOperation("浼樺寲鐗╂枡搴撳瓨璁板綍鏌ヨ鎺ュ彛")
@SaCheckPermission("warehouseReport.search")
@PostMapping("/getOptimizeOutboundReport/{type}/{pageNum}/{pageSize}/{selectDate}")
public Result getOptimizeOutboundReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody MaterialLog materialLog){
- return Result.seccess(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
+ return Result.success(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
+ }
+
+ @ApiOperation("鐗╂枡鍑哄簱淇濆瓨骞跺鏍告帴鍙�")
+ @SaCheckPermission("createOutbound.add")
+ @PostMapping("/saveToExamineMaterialOutbound")
+ public Result saveToExamineMaterialOutbound( @RequestBody Map<String,Object> object){
+
+ return Result.success(materialInventoryService.saveToExamineMaterialOutbound(object));
+
+ }
+
+ @ApiOperation("鐗╂枡搴撳瓨淇敼鎺ュ彛")
+ @SaCheckPermission("selectIngredientsStock.add")
+ @PostMapping("/updateMaterialInventory")
+ public Result updateMaterialInventory( @RequestBody Map<String,Object> object){
+ return Result.success(materialInventoryService.updateMaterialInventory(object));
}
--
Gitblit v1.8.0