From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +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/api/controller/pda/MobileController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index eed0ce4..1b59c9a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -84,7 +84,7 @@
if (Objects.isNull(params)) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.receiptToWarehouse(params);
+ return mobileService.receiptToWarehouse(params, getLoginUserId());
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -123,12 +123,12 @@
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
- @GetMapping("/asnOrderItem/trackCode/{code}")
- public R getItemByTrackCode(@PathVariable String code) {
- if (StringUtils.isBlank(code)) {
- return R.error("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ @PostMapping("/asnOrderItem/trackCode")
+ public R getItemByTrackCode(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getDeltByCode(code);
+ return mobileService.getDeltByCode(params);
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@@ -142,7 +142,7 @@
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勬嫋")
+ @ApiOperation("缁勬墭")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
Long userId = getLoginUserId();
--
Gitblit v1.9.1