From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +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 | 25 +++++++++++++++++++------
1 files changed, 19 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 173025d..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
@@ -1,9 +1,7 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.controller.params.CheckObjParams;
-import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
-import com.vincent.rsf.server.api.controller.params.ReceiptParams;
+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.QlyIsptItem;
@@ -13,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
/**
* @author Ryan
@@ -27,7 +26,7 @@
R getOrderByCode(String barcode);
- R receiptToWarehouse(ReceiptParams orders);
+ R receiptToWarehouse(Map<String, Object> orders);
R otherReceipt(OtherReceiptParams params);
@@ -39,7 +38,7 @@
R getDeltByCode(String code);
- WaitPakin mergeItems(WaitPakinParam waitPakin);
+ WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId);
WaitPakin unBind(WaitPakinParam param);
@@ -49,5 +48,19 @@
R checkObjs(CheckObjParams params);
- R checkUpdate(QlyIsptItem params);
+ R checkUpdate(List<QlyIsptItem> params);
+
+ R operateToStock(OpStockParams params);
+
+ R publicToStock(PublicToStockParams params, Long loginUserId);
+
+ 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