From d5055b7870d0406f9b00d429cb47d2bfb79b902c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 十二月 2025 11:37:09 +0800
Subject: [PATCH] 补片流程卡添加打印次数
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 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 a248dda..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
@@ -3,18 +3,26 @@
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;
@@ -30,42 +38,42 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@ApiOperation("琛ョ墖鏂板鏌ヨ鎺ュ彛")
- @SaCheckPermission("AddReplenish.search")
+ @SaCheckPermission("addReplenish.search")
@PostMapping("/getSelectReplenish/{pageNum}/{pageSize}")
- public Result getSelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
- return Result.seccess(replenishService.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")
+ @SaCheckPermission("selectReplenish.search")
@PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
- public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLog patchLog){
- return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLog));
+ 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")
+ @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")
+ @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));
}
@@ -74,14 +82,39 @@
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));
}
-// @ApiOperation("琛ョ墖鍒犻櫎鎺ュ彛")
-// @SaCheckPermission("SelectReplenish.review")
-// @PostMapping("/deleteReplenish")
-// public Result deleteReplenish( @RequestBody Map<String,Object> object){
-// return Result.seccess(replenishService.deleteReplenishSv(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