From d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 08:04:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 2cb928b..8efedda 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -161,7 +161,6 @@
return checkOrderService.saveCheckOrder(params, getLoginUserId());
}
-
@ApiOperation("鐩樼偣鍗曚俊鎭慨鏀�")
@PostMapping("/check/items/update")
@PreAuthorize("hasAuthority('manager:check:update')")
@@ -172,18 +171,15 @@
return checkOrderService.updateOrderItem(params, getLoginUserId());
}
- @PostMapping("/outStock/order/getOutTaskItems")
+ @PostMapping("/check/order/items")
@ApiOperation("鐩樼偣鍑哄簱棰勮")
- @PreAuthorize("hasAuthority('manager:outStock:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param) {
if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
-
return checkOrderService.genCheckPreview(param);
}
-
-
/**
* 鑾峰彇鍑哄簱绔欑偣
@@ -197,6 +193,17 @@
}
+ @ApiOperation("鑾峰彇鍦ㄥ簱鐗╂枡鍒楄〃")
+ @GetMapping("/check/order/locs/{matnr}")
+ @PreAuthorize("hasAuthority('manager:check:list')")
+ public R getAllLocByMatnr(@PathVariable String[] matnrs) {
+ if (Objects.isNull(matnrs)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return checkOrderService.getAllLocByMatnr(Arrays.asList(matnrs));
+ }
+
+
/**
* @author Ryan
* @description 涓嬭浇妯℃澘
--
Gitblit v1.9.1