From 340b69790a7a2eff1ff5de75f109dc77f4b4008f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十一月 2024 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/java/com/zy/asrs/service/MobileService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index e5a260d..d1d65fc 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -41,7 +41,10 @@
     void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                   Double curOutQty, Integer ioType, Long userId, Date now);
 
-    R manDetlIn(JSONObject json, User user);
+    R manDetlIn(JSONObject json ,User user);
 
     R manDetlOut(JSONObject json,User user);
+    R manDetlInBarcode(JSONObject json ,User user);
+
+    R barcodeDelete(JSONObject json, User user);
 }

--
Gitblit v1.9.1