From b67bf724fc788cb3b86641c7eb7a35cdbc4c7a93 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 20:17:25 +0800
Subject: [PATCH] PO单导入功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 1b59c9a..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
@@ -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