From 7791957685b2630fb0fd4a8c2b73e1867519a4f1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 07 五月 2025 10:04:32 +0800
Subject: [PATCH] #pda组托+物料组托

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java |   17 -----------------
 1 files changed, 0 insertions(+), 17 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..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
@@ -159,23 +159,6 @@
     }
 
     @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("缁勬嫋瑙g粦")
     @PostMapping("/waitPakin/unbind")
     public R pakinUnBind(@RequestBody WaitPakinParam param) {

--
Gitblit v1.9.1