From 3f294a08674f431ced84407df1a3b30eecaeac1e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 11:19:08 +0800
Subject: [PATCH] 修改成品入库报表导出功能，以及玻璃料架模块部分功能开发
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
index b64f7d1..dec4be6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java
@@ -3,18 +3,21 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
-import com.example.erp.entity.mm.FinishedGlassShelfEmit;
-import com.example.erp.entity.mm.MaterialStore;
+import com.example.erp.entity.mm.*;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.service.mm.FinishedGlassShelfService;
import com.example.erp.service.mm.MaterialStoreService;
+import com.example.erp.tools.DownExcel;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -81,5 +84,43 @@
return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
}
+ @ApiOperation("鐜荤拑鏂欐灦鍏ュ簱鏂板鎺ュ彛")
+ @PostMapping("/insertFinishedGlassShelfWithdraw")
+ public Result insertFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
+ return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfWithdraw(object));
+ }
+
+ @ApiOperation("鐜荤拑鏂欐灦鍏ュ簱鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectFinishedGlassShelfWithdraw/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectFinishedGlassShelfWithdraw(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
+ @RequestBody FinishedGlassShelfWithdraw finishedGlassShelfWithdraw) throws JsonProcessingException {
+ return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdraw(pageNum,pageSize,selectDate,finishedGlassShelfWithdraw));
+ }
+
+ @ApiOperation("鐜荤拑鏂欐灦缂栬緫鍏ュ簱鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectFinishedGlassShelfWithdrawDetails/{pageNum}/{pageSize}")
+ public Result getSelectFinishedGlassShelfWithdrawDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String withdrawId){
+ return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
+ }
+
+ @ApiOperation("鐜荤拑鏂欐灦鍏ュ簱鍒犻櫎鎺ュ彛")
+ @PostMapping("/deleteFinishedGlassShelfWithdraw")
+ public Result deleteFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
+ return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfWithdraw(object));
+ }
+
+ @ApiOperation("鐜荤拑鏂欐灦璁板綍鏌ヨ鎺ュ彛")
+ @PostMapping("/getFinishedGlassShelfLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
+ public Result getFinishedGlassShelfLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate, @RequestBody FinishedGlassShelfLog finishedGlassShelfLog){
+ return Result.seccess(finishedGlassShelfService.getFinishedGlassShelfLogReport(type,pageNum,pageSize,selectDate,finishedGlassShelfLog));
+ }
+
+ @ApiOperation("鐜荤拑鏂欐灦璁板綍鎶ヨ〃瀵煎嚭")
+ @PostMapping("/exportFinishedGlassShelfLogReport/{type}")
+ public void exportFinishedGlassShelfLogReport(@PathVariable String type, HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ DownExcel.download(response, FinishedGlassShelfLog.class, finishedGlassShelfService.exportFinishedGlassShelfLogReport(dates,type),"finishedGlassShelf");
+ }
+
}
--
Gitblit v1.8.0