From dc60b3451a2984722c01a5991e5b904b8bd44f0d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:33 +0800
Subject: [PATCH] 组绑解绑
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 23 +++++------------------
1 files changed, 5 insertions(+), 18 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 fd824b7..9109bf7 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
@@ -138,7 +138,11 @@
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getItemByContainer(params);
+ if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
+ return mobileService.getUnItemByContainer(params);
+ } else {
+ return mobileService.getItemByContainer(params);
+ }
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -156,23 +160,6 @@
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
return R.ok(mobileService.mergeItems(waitPakin, userId));
- }
-
- @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')")
--
Gitblit v1.9.1