From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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 | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 b63ead2..d3de1b1 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
@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.*;
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;
@@ -26,19 +26,19 @@
R getOrderByCode(String barcode);
- R receiptToWarehouse(Map<String, Object> orders);
+ R receiptToWarehouse(Map<String, Object> orders, Long loginUserId);
R otherReceipt(OtherReceiptParams params);
- List<AsnOrder> getAllAsnOrders();
+ List<WkOrder> getAllAsnOrders();
R getReceiptAreas();
List<Fields> getDynamicFields();
- R getDeltByCode(String code);
+ R getDeltByCode(Map<String, Object> params);
- WaitPakin mergeItems(WaitPakinParam waitPakin);
+ WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
WaitPakin unBind(WaitPakinParam param);
@@ -48,7 +48,7 @@
R checkObjs(CheckObjParams params);
- R checkUpdate(List<QlyIsptItem> params);
+ R checkUpdate(List<QlyIsptItem> params, Long loginUserId);
R operateToStock(OpStockParams params);
@@ -61,4 +61,16 @@
R completeOrder(Long id, Long loginUserId);
R getItemByContainer(Map<String, Object> params);
+
+ R getUnItemByContainer(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