From 32d0aa7ac0034561d3b8b5a9d35a54ba1cace6a6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 五月 2025 17:00:08 +0800
Subject: [PATCH] #pda物料组托
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 c18bf62..fd824b7 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
@@ -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')")
@@ -159,6 +159,23 @@
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("鐗╂枡缁勬墭")
+ @PostMapping("/waitPakin/matnr/merge")
+ public R pikinMatnrOrder(@RequestBody WaitPakinParam waitPakin) {
+ Long userId = getLoginUserId();
+ if (Objects.isNull(waitPakin)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
+ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ return R.ok(mobileService.mergeMatnrItems(waitPakin, userId));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬嫋瑙ｇ粦")
@PostMapping("/waitPakin/unbind")
public R pakinUnBind(@RequestBody WaitPakinParam param) {
--
Gitblit v1.9.1