From 3217d11481d7440f1526499d14a0c398369aa0e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 14:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |   12 ++++++++++--
 1 files changed, 10 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 ab4daa7..121003c 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
@@ -26,7 +26,7 @@
 
     R getOrderByCode(String barcode);
 
-    R receiptToWarehouse(Map<String, Object> orders);
+    R receiptToWarehouse(Map<String, Object> orders, Long loginUserId);
 
     R otherReceipt(OtherReceiptParams params);
 
@@ -38,7 +38,7 @@
 
     R getDeltByCode(String code);
 
-    WaitPakin mergeItems(WaitPakinParam waitPakin);
+    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 
@@ -63,4 +63,12 @@
     R getItemByContainer(Map<String, Object> params);
 
     R defectProducts(String trackCode);
+
+    R getPakinInStock(String barcode);
+
+    R getDeviceSites();
+
+    R getRecommondLocs();
+
+    R generateTask(Map<String, Object> map, Long loginUserId);
 }

--
Gitblit v1.9.1