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

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 a1169d0..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
@@ -1,13 +1,17 @@
 package com.vincent.rsf.server.api.service;
 
 import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
+import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
+import com.vincent.rsf.server.api.controller.erp.params.PublicToStockParams;
 import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
 import com.vincent.rsf.server.manager.entity.QlyIsptItem;
 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;
@@ -30,9 +34,9 @@
 
     R otherReceipt(OtherReceiptParams params);
 
-    List<AsnOrder> getAllAsnOrders();
+    List<WkOrder> getAllAsnOrders();
 
-    R getReceiptAreas();
+    R getReceiptAreas(User user);
 
     List<Fields> getDynamicFields();
 
@@ -40,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