From 9a3f96bae11e9d4303474996e7097e079649f376 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 13:19:53 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..935e9d7 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,13 +36,16 @@
 
     List<WkOrder> getAllAsnOrders();
 
-    R getReceiptAreas();
+    R getReceiptAreas(User user);
+    R getAreasUserAll(User user);
 
     List<Fields> getDynamicFields();
 
     R getDeltByCode(Map<String, Object> params);
 
     WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
+
+    WaitPakin mergeItemsWcs(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 
@@ -63,7 +67,7 @@
 
     R completeOrder(Long id, Long loginUserId);
 
-    R getItemByContainer(Map<String, Object> params);
+    R getItemByContainer(Map<String, Object> params,User user);
 
     R getUnItemByContainer(Map<String, Object> params);
 

--
Gitblit v1.9.1