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 | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 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..c559028
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -0,0 +1,120 @@
+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.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;
+
+@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.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.success(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
+ }
+
+
+ @ApiOperation("琛ョ墖鏂板鎺ュ彛")
+ @SaCheckPermission("addReplenish.add")
+ @PostMapping("/saveReplenish")
+ public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
+ return Result.success(replenishService.saveReplenish(object));
+ }
+
+ @ApiOperation("琛ョ墖瀹℃牳鎺ュ彛")
+ @SaCheckPermission("selectReplenish.review")
+ @PostMapping("/updateReplenish")
+ public Result updateReplenish( @RequestBody Map<String,Object> object){
+ return Result.success(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.success(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.success(replenishService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+ }
+
+ @ApiOperation("琛ョ墖鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectReplenish.delete")
+ @PostMapping("/deleteReplenish")
+ public Result deleteReplenish( @RequestBody Map<String,Object> object){
+ return Result.success(replenishService.deleteReplenishSv(object));
+ }
+
+ @ApiOperation("琛ョ墖鍙嶅鎺ュ彛")
+ @SaCheckPermission("selectReplenish.countertrial")
+ @PostMapping("/updateCancelReview")
+ public Result updateCancelReview( @RequestBody Map<String,Object> 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