From 3ee23fa2bfb5f90863a1e2579c882b4bae875aa3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 31 五月 2024 11:50:10 +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/FinishedGoodsInventoryController.java | 89 +++++++++++---------------------------------
1 files changed, 22 insertions(+), 67 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 0b1f5ef..31e1e66 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,11 +5,14 @@
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;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.mm.FinishedGoodsInventoryService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,9 @@
import com.example.erp.entity.mm.FinishedGoodsInventory;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -48,12 +54,8 @@
@SaCheckPermission("CreateProductStock.add")
@PostMapping("/addSelectWarehousing")
public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
- if(finishedGoodsInventoryService.addSelectWarehousing(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"鍏ュ簱澶辫触");
+ return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
- }
}
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
@@ -69,12 +71,7 @@
@SaCheckPermission("FinishedProductOut.add")
@PostMapping("/addDeliveryDetail")
public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
- if(finishedGoodsInventoryService.addDeliveryDetail(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"鍑哄簱澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
}
/* 璋冩嫧鏌ヨ*/
@@ -90,14 +87,7 @@
@SaCheckPermission("OrderAllocation.add")
@PostMapping("/updateFinishedGoodsInventoryAllocate")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
-
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触,璇锋鏌ヨ鍗曡緭鍏ユ槸鍚︽纭�");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
}
/*璋冩嫧璁板綍鏌ヨ*/
@@ -113,14 +103,7 @@
@SaCheckPermission("FinishedGoodsIssue.add")
@PostMapping("/updateFinishedGoodsInventoryTakeOut")
public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
}
/*棰嗗嚭璁板綍鏌ヨ*/
@@ -135,14 +118,7 @@
@ApiOperation("璁㈠崟杩斿伐鏌ヨ鎺ュ彛")
@PostMapping("/updateFinishedGoodsInventoryRework")
public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"杩斿伐澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
}
@@ -152,28 +128,14 @@
@SaCheckPermission("TakeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryToExamine")
public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳")){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
}
/*璁㈠崟鍙嶅*/
@ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
@SaCheckPermission("TakeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryCounterExamination")
public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅")){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
}
/*璁㈠崟浣滃簾*/
@@ -181,14 +143,7 @@
@SaCheckPermission("TakeOutRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryToExamine")
public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
}
/*鍑哄叆搴撹褰曟煡璇�*/
@@ -204,14 +159,7 @@
@SaCheckPermission("storageRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryStorage")
public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
-
- if(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"杩斿洖澶辫触");
-
- }
+ return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
}
@ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
@@ -220,4 +168,11 @@
public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
}
+
+ @ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
+ @PostMapping("/exportFinishedOperateLogReport")
+ public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+ }
}
--
Gitblit v1.8.0