From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 492b889..932f558 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 javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Ryan
@@ -25,7 +26,7 @@
 
     R getOrderByCode(String barcode);
 
-    R receiptToWarehouse(ReceiptParams orders);
+    R receiptToWarehouse(Map<String, Object> orders);
 
     R otherReceipt(OtherReceiptParams params);
 
@@ -37,7 +38,7 @@
 
     R getDeltByCode(String code);
 
-    WaitPakin mergeItems(WaitPakinParam waitPakin);
+    WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 
@@ -47,7 +48,7 @@
 
     R checkObjs(CheckObjParams params);
 
-    R checkUpdate(QlyIsptItem params);
+    R checkUpdate(List<QlyIsptItem> params);
 
     R operateToStock(OpStockParams params);
 
@@ -56,4 +57,10 @@
     R taskToStock(String code);
 
     R taskGetLocs(String code) throws Exception;
+
+    R completeOrder(Long id, Long loginUserId);
+
+    R getItemByContainer(Map<String, Object> params);
+
+    R defectProducts(String trackCode);
 }

--
Gitblit v1.9.1