From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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 | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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..c2cb79e 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;
@@ -44,6 +45,7 @@
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.saveMaterialInventory(object));
}
+
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
@SaCheckPermission("selectIngredientsStock.search")
@@ -178,7 +180,7 @@
@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");
}
@@ -186,6 +188,12 @@
@PostMapping ("/mesMaterialOutbound")
public Result mesMaterialOutbound(@RequestBody Map<String,Object> reportingWork) {
return Result.seccess(materialInventoryService.mesMaterialOutbound(reportingWork));
+ }
+
+ @ApiOperation("mes鍘熺墖鏌ヨ")
+ @PostMapping ("/mesOriginalSelect")
+ public Result mesOriginalSelect() {
+ return Result.seccess(materialInventoryService.mesOriginalSelect());
}
@ApiOperation("鐗╂枡鏂板杩斿洖鎺ュ彛")
@@ -201,5 +209,21 @@
return Result.seccess(materialInventoryService.getOptimizeOutboundReport(type,pageNum,pageSize,selectDate,materialLog));
}
+ @ApiOperation("鐗╂枡鍑哄簱淇濆瓨骞跺鏍告帴鍙�")
+ @SaCheckPermission("createOutbound.add")
+ @PostMapping("/saveToExamineMaterialOutbound")
+ public Result saveToExamineMaterialOutbound( @RequestBody Map<String,Object> object){
+
+ return Result.seccess(materialInventoryService.saveToExamineMaterialOutbound(object));
+
+ }
+
+ @ApiOperation("鐗╂枡搴撳瓨淇敼鎺ュ彛")
+ @SaCheckPermission("selectIngredientsStock.add")
+ @PostMapping("/updateMaterialInventory")
+ public Result updateMaterialInventory( @RequestBody Map<String,Object> object){
+ return Result.seccess(materialInventoryService.updateMaterialInventory(object));
+ }
+
}
--
Gitblit v1.8.0