From d99a433c0d0e433e5cd8d216562a3fba5bd3fdd6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 22 一月 2026 08:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index 75ba877..54b9788 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -20,7 +20,6 @@
@Autowired
private PdaCheckOrderService pdaCheckOrderService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getCheckList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍗曞垪琛�")
public R getCheckList(@RequestBody Map<String, String> map) {
@@ -28,15 +27,20 @@
return pdaCheckOrderService.getCheckList(map.get("code"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getCheckTaskItemList")
@ApiOperation("鏌ヨ鐩樼偣浠诲姟鍒楄〃")
public R getCheckTaskItemList(@RequestBody Map<String, String> map) {
- return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"),map.get("checkCode"));
+ return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"), map.get("checkCode"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/getCheckTaskItemList2")
+ @ApiOperation("鏌ヨ鐩樼偣浠诲姟鍒楄〃,鐩存帴鎵鍣ㄧ爜")
+ public R getCheckTaskItemList2(@RequestBody Map<String, String> map) {
+
+ return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
+ }
+
@GetMapping("/getCheckDiffReasonList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍘熷洜")
public R getCheckDiffReasonList() {
@@ -44,15 +48,12 @@
return pdaCheckOrderService.getCheckDiffReasonList();
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveCheckDiff")
@ApiOperation("淇濆瓨鐩樼偣鏁版嵁")
public R saveCheckDiff(@RequestBody SaveCheckDiffParams saveCheckDiffParams) {
-
- return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams,getLoginUserId());
+ return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/selectAddMatnr")
@ApiOperation("鏌ヨ闇�瑕佹坊鍔犵殑鐗╂枡")
public R selectAddMatnr(@RequestBody Map<String, String> map) {
--
Gitblit v1.9.1