From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGlassShelfController.java |   69 +++++++++++++++++++++++++++-------
 1 files changed, 55 insertions(+), 14 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..c4e8232 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;
 
@@ -28,43 +31,43 @@
     @ApiOperation("鐜荤拑鏂欐灦鏂板鎺ュ彛")
     @PostMapping("/saveFinishedGlassShelf")
     public Result saveFinishedGlassShelf( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGlassShelfService.saveFinishedGlassShelf(object));
+        return Result.success(finishedGlassShelfService.saveFinishedGlassShelf(object));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦搴撳瓨鏌ヨ鎺ュ彛")
-    @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}")
-    public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
-        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize));
+    @PostMapping("/getSelectFinishedGlassShelfInformation/{pageNum}/{pageSize}/{type}")
+    public Result getSelectFinishedGlassShelfInformation(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable String type){
+        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformation(pageNum,pageSize,type));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦搴撳瓨鏌ヨ鎺ュ彛")
     @PostMapping("/getSelectFinishedGlassShelfInformationById/{id}")
     public Result getSelectFinishedGlassShelfInformationById(@PathVariable Long id){
-        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
+        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationById(id));
     }
 
     @ApiOperation("鍒犻櫎鐜荤拑鏂欐灦鎺ュ彛")
     @PostMapping("/deleteFinishedGlassShelfInformationById")
     public Result deleteFinishedGlassShelfInformationById( @RequestBody Map<String,Object>  object){
-        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
+        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfInformationById(object));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦鏂板鍑哄簱鏄庣粏鏌ヨ鎺ュ彛")
     @PostMapping("/getSelectFinishedGlassShelfInformationDetails/{pageNum}/{pageSize}")
-    public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String ids){
-        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,ids));
+    public Result getSelectFinishedGlassShelfInformationDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody List<Map<String, Object>> object){
+        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfInformationDetails(pageNum,pageSize,object));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦缂栬緫鍑哄簱鏄庣粏鏌ヨ鎺ュ彛")
     @PostMapping("/getSelectFinishedGlassShelfEmitDetails/{pageNum}/{pageSize}")
     public Result getSelectFinishedGlassShelfEmitDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody String emitId){
-        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
+        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmitDetails(pageNum,pageSize,emitId));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦鍑哄簱鏂板鎺ュ彛")
     @PostMapping("/insertFinishedGlassShelfEmit")
     public Result insertFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
-        return Result.seccess(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
+        return Result.success(finishedGlassShelfService.insertFinishedGlassShelfEmit(object));
     }
 
 
@@ -72,13 +75,51 @@
     @PostMapping("/getSelectFinishedGlassShelfEmit/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectFinishedGlassShelfEmit(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,
                                                   @RequestBody FinishedGlassShelfEmit finishedGlassShelfEmit) throws JsonProcessingException {
-        return Result.seccess(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
+        return Result.success(finishedGlassShelfService.getSelectFinishedGlassShelfEmit(pageNum,pageSize,selectDate,finishedGlassShelfEmit));
     }
 
     @ApiOperation("鐜荤拑鏂欐灦鍑哄簱鍒犻櫎鎺ュ彛")
     @PostMapping("/deleteFinishedGlassShelfEmit")
     public Result deleteFinishedGlassShelfEmit( @RequestBody Map<String,Object> object){
-        return Result.seccess(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
+        return Result.success(finishedGlassShelfService.deleteFinishedGlassShelfEmit(object));
+    }
+
+    @ApiOperation("鐜荤拑鏂欐灦鍏ュ簱鏂板鎺ュ彛")
+    @PostMapping("/insertFinishedGlassShelfWithdraw")
+    public Result insertFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
+        return Result.success(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.success(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.success(finishedGlassShelfService.getSelectFinishedGlassShelfWithdrawDetails(pageNum,pageSize,withdrawId));
+    }
+
+    @ApiOperation("鐜荤拑鏂欐灦鍏ュ簱鍒犻櫎鎺ュ彛")
+    @PostMapping("/deleteFinishedGlassShelfWithdraw")
+    public Result deleteFinishedGlassShelfWithdraw( @RequestBody Map<String,Object> object){
+        return Result.success(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.success(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