From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index 5f22c54..e2c3536 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -42,7 +42,7 @@
@Autowired
private CompanysService companysService;
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@PostMapping("/asnOrderItem/page")
public R page(@RequestBody Map<String, Object> map) {
@@ -61,25 +61,25 @@
return R.ok(page);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(asnOrderItemService.list());
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({"/asnOrderItem/many/{ids}", "/asnOrderItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids)));
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/asnOrderItem/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(asnOrderItemService.getById(id));
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:save')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:save')")
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrderItem/save")
public R save(@RequestBody Map<String, Object> params) {
@@ -96,7 +96,7 @@
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrderItem/update")
public R update(@RequestBody WkOrderItem wkOrderItem) {
@@ -116,7 +116,7 @@
return R.ok("Update Success").add(wkOrderItem);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:remove')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@OperationLog("Delete ASN鍗曟嵁")
@PostMapping("/asnOrderItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -126,7 +126,7 @@
return R.ok("Delete Success").add(ids);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -140,7 +140,7 @@
return R.ok().add(vos);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/export")
@ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
@@ -179,7 +179,7 @@
*/
@PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
- @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
@@ -197,7 +197,7 @@
*/
@PostMapping("/asnOrderItem/template/download")
@ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
List<AsnOrderTemplate> list = Arrays.asList(template);
--
Gitblit v1.9.1