From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 11 五月 2025 15:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java |    3 ++-
 1 files changed, 2 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 39e52f1..b76d370 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
@@ -40,7 +40,6 @@
 
     WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
 
-    WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId);
 
     WaitPakin unBind(WaitPakinParam param);
 
@@ -64,6 +63,8 @@
 
     R getItemByContainer(Map<String, Object> params);
 
+    R getUnItemByContainer(Map<String, Object> params);
+
     R defectProducts(String trackCode);
 
     R getPakinInStock(String barcode);

--
Gitblit v1.9.1