From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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/pp/ReplenishController.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 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
new file mode 100644
index 0000000..52519a6
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -0,0 +1,96 @@
+package com.example.erp.controller.pp;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
+import com.example.erp.dto.pp.PatchLogAddDTO;
+import com.example.erp.dto.pp.PatchLogDTO;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Date;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Api(value="琛ョ墖controller",tags={"琛ョ墖鎿嶄綔鎺ュ彛"})
+@RequestMapping("/Replenish")
+public class ReplenishController {
+
+    @Autowired
+    ReplenishService replenishService;
+
+
+
+    /*鍙戣揣璁㈠崟鏌ヨ*/
+    @ApiOperation("琛ョ墖鏂板鏌ヨ鎺ュ彛")
+    @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));
+    }
+
+    @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));
+    }
+
+
+    @ApiOperation("琛ョ墖鏂板鎺ュ彛")
+    @SaCheckPermission("addReplenish.add")
+    @PostMapping("/saveReplenish")
+    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
+        return Result.seccess(replenishService.saveReplenish(object));
+    }
+
+    @ApiOperation("琛ョ墖瀹℃牳鎺ュ彛")
+    @SaCheckPermission("selectReplenish.review")
+    @PostMapping("/updateReplenish")
+    public Result updateReplenish( @RequestBody Map<String,Object> object){
+        return Result.seccess(replenishService.updateReplenish(object));
+    }
+
+    @ApiOperation("琛ョ墖娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+    @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));
+
+    }
+
+    @ApiOperation("琛ョ墖鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
+    public Result getSelectPrintCustomLabel( @PathVariable String type,
+                                             @PathVariable Integer lableType,
+                                             @RequestBody Map<String, Object> object) {
+        return Result.seccess(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+    }
+
+    @ApiOperation("琛ョ墖鍒犻櫎鎺ュ彛")
+    @SaCheckPermission("selectReplenish.delete")
+    @PostMapping("/deleteReplenish")
+    public Result deleteReplenish( @RequestBody Map<String,Object> object){
+        return Result.seccess(replenishService.deleteReplenishSv(object));
+    }
+
+    @ApiOperation("琛ョ墖鍙嶅鎺ュ彛")
+    @SaCheckPermission("selectReplenish.countertrial")
+    @PostMapping("/updateCancelReview")
+    public Result updateCancelReview( @RequestBody Map<String,Object> object){
+        return Result.seccess(replenishService.updateCancelReviewSv(object));
+    }
+}

--
Gitblit v1.8.0