From 1275eac767a6fe0b4dd68bab27e2b1fb78d55b51 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 17 四月 2025 16:09:46 +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/ReworkController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
index e6ff036..d570183 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
+import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
@@ -30,36 +31,36 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@ApiOperation("鍙繑宸ユ暟鎹煡璇㈡帴鍙�")
- @SaCheckPermission("AddRework.search")
+ @SaCheckPermission("addRework.search")
@PostMapping("/getSelectRework/{pageNum}/{pageSize}")
public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
}
@ApiOperation("杩斿伐鏁版嵁鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectRework.search")
+ @SaCheckPermission("selectRework.search")
@PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
- public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
+ public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
}
@ApiOperation("杩斿伐鎺ュ彛鏂板")
- @SaCheckPermission("AddRework.add")
+ @SaCheckPermission("addRework.add")
@PostMapping("/saveRework")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
return Result.seccess(reworkService.saveRework(object));
}
@ApiOperation("杩斿伐瀹℃牳鎺ュ彛")
- @SaCheckPermission("SelectRework.review")
+ @SaCheckPermission("selectRework.review")
@PostMapping("/updateRework")
public Result updateRework( @RequestBody Map<String,Object> object){
return Result.seccess(reworkService.updateRework(object));
}
@ApiOperation("杩斿伐娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("PrintFlowCard.search")
+ @SaCheckPermission("printReworkFlowCard.search")
@PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
public Result selectPrint(
@PathVariable Date selectTime1,
@@ -70,7 +71,7 @@
}
@ApiOperation("杩斿伐鍒犻櫎鎺ュ彛")
- @SaCheckPermission("SelectRework.delete")
+ @SaCheckPermission("selectRework.delete")
@PostMapping("/deleteRework")
public Result deleteRework( @RequestBody Map<String,Object> object){
return Result.seccess(reworkService.deleteReworkSv(object));
--
Gitblit v1.8.0