From f8f3c56936e606a97cd8fe2a7624f6e7bb91481c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 12 一月 2026 13:04:14 +0800
Subject: [PATCH] #

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 5ce4eff..0b4f842 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -11,6 +11,7 @@
 import com.vincent.rsf.server.manager.entity.WaitPakin;
 import com.vincent.rsf.server.system.controller.param.LoginParam;
 import com.vincent.rsf.server.system.entity.Fields;
+import com.vincent.rsf.server.system.entity.User;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -35,7 +36,7 @@
 
     List<WkOrder> getAllAsnOrders();
 
-    R getReceiptAreas();
+    R getReceiptAreas(User user);
 
     List<Fields> getDynamicFields();
 
@@ -43,6 +44,8 @@
 
     WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
+    WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId);
+
     WaitPakin unBind(WaitPakinParam param);
 
     R inspect(String code, Long loginUserId);

--
Gitblit v1.9.1