From 95270d9f2d0c93b52569268737902c4f09216c6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 12:04:39 +0800
Subject: [PATCH] 返工查询后端筛选提交
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index 36d499d..b12a326 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -5,6 +5,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.mm.FinishedOperateLogDTO;
import com.example.erp.entity.mm.FinishedOperateLog;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.Order;
@@ -156,7 +157,7 @@
/*鍑哄叆搴撹繑鍥�*/
@ApiOperation("鍑哄叆搴撹繑鍥炴帴鍙�")
@SaCheckPermission("storageRecord.update")
- @PostMapping("/cancelFini shedGoodsInventoryStorage")
+ @PostMapping("/cancelFinishedGoodsInventoryStorage")
public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
}
@@ -172,6 +173,16 @@
@PostMapping("/exportFinishedOperateLogReport")
public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
- DownExcel.download(response, FinishedOperateLog.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+ DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+ }
+
+
+ /*璁㈠崟涓�閿叆搴�*/
+ @ApiOperation("璁㈠崟涓�閿叆搴�")
+ @SaCheckPermission("CreateProductStock.add")
+ @PostMapping("/oneClickStorage/{orderId}/{userName}")
+ public Result oneClickStorage( @PathVariable String orderId,@PathVariable String userName){
+ return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
+
}
}
--
Gitblit v1.8.0