From ac225bd66eb7c21b5af1d8533dc59376ea53da6c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:42 +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/pp/ReplenishController.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
index c2297e4..c559028 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -5,18 +5,24 @@
 import com.example.erp.common.Result;
 import com.example.erp.dto.pp.PatchLogAddDTO;
 import com.example.erp.dto.pp.PatchLogDTO;
+import com.example.erp.dto.pp.TeamOutputDTO;
+import com.example.erp.dto.pp.exportReplenishDTO;
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.pp.PatchLog;
 import com.example.erp.entity.pp.Rework;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.pp.ReplenishService;
 import com.example.erp.service.pp.ReworkService;
+import com.example.erp.tools.DownExcel;
 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.sql.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -35,14 +41,14 @@
     @SaCheckPermission("addReplenish.search")
     @PostMapping("/getSelectReplenish/{pageNum}/{pageSize}")
     public Result getSelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@RequestBody PatchLogAddDTO patchLogAddDTO){
-        return Result.seccess(replenishService.getSelectReplenish(pageNum,pageSize,patchLogAddDTO));
+        return Result.success(replenishService.getSelectReplenish(pageNum,pageSize,patchLogAddDTO));
     }
 
     @ApiOperation("琛ョ墖鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectReplenish.search")
     @PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
     public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLogDTO patchLogDTO){
-        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
+        return Result.success(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
     }
 
 
@@ -50,24 +56,24 @@
     @SaCheckPermission("addReplenish.add")
     @PostMapping("/saveReplenish")
     public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
-        return Result.seccess(replenishService.saveReplenish(object));
+        return Result.success(replenishService.saveReplenish(object));
     }
 
     @ApiOperation("琛ョ墖瀹℃牳鎺ュ彛")
     @SaCheckPermission("selectReplenish.review")
     @PostMapping("/updateReplenish")
     public Result updateReplenish( @RequestBody Map<String,Object> object){
-        return Result.seccess(replenishService.updateReplenish(object));
+        return Result.success(replenishService.updateReplenish(object));
     }
 
     @ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
-    @SaCheckPermission("printFlowCard.search")
+    @SaCheckPermission("printReplenishFlowCard.search")
     @PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
     public Result selectPrint(
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2,
             @RequestBody FlowCard flowCard) {
-        return Result.seccess(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
+        return Result.success(replenishService.selectPrintSv(selectTime1,selectTime2, flowCard));
 
     }
 
@@ -76,7 +82,7 @@
     public Result getSelectPrintCustomLabel( @PathVariable String type,
                                              @PathVariable Integer lableType,
                                              @RequestBody Map<String, Object> object) {
-        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
+        return Result.success(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
 
     }
 
@@ -84,13 +90,31 @@
     @SaCheckPermission("selectReplenish.delete")
     @PostMapping("/deleteReplenish")
     public Result deleteReplenish( @RequestBody Map<String,Object> object){
-        return Result.seccess(replenishService.deleteReplenishSv(object));
+        return Result.success(replenishService.deleteReplenishSv(object));
     }
 
     @ApiOperation("琛ョ墖鍙嶅鎺ュ彛")
     @SaCheckPermission("selectReplenish.countertrial")
     @PostMapping("/updateCancelReview")
     public Result updateCancelReview( @RequestBody Map<String,Object> object){
-        return Result.seccess(replenishService.updateCancelReviewSv(object));
+        return Result.success(replenishService.updateCancelReviewSv(object));
+    }
+
+    @ApiOperation("琛ョ墖淇℃伅瀵煎嚭")
+    @PostMapping("/exportReplenish")
+    public void exportReplenish(HttpServletResponse response,
+                                 @RequestBody List<LocalDate> dates
+    ) throws IOException, IllegalAccessException, InstantiationException {
+        //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+        DownExcel.download(response, exportReplenishDTO.class, replenishService.exportReplenishSv(dates), "PatchLogAddDTO");
+    }
+
+    @ApiOperation("淇敼鎵撳嵃娆℃暟")
+    @PostMapping("/updatePrintNum")
+    public Result updatePrintNum(
+            @RequestBody List<Map<String, Object>> object
+    ) {
+
+        return Result.success(replenishService.updatePrintNumSv(object));
     }
 }

--
Gitblit v1.8.0