From 98d4db97d3c21f9b31f978249c5572fdae948088 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 09 四月 2025 13:21:22 +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 | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 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 2a2f597..a1c2e6f 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,13 +1,17 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.framework.common.R;
-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;
+import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.system.controller.param.LoginParam;
+import com.vincent.rsf.server.system.entity.Fields;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
/**
* @author Ryan
@@ -22,9 +26,37 @@
R getOrderByCode(String barcode);
- R receiptToWarehouse(ReceiptParams orders);
+ R receiptToWarehouse(Map<String, Object> orders);
R otherReceipt(OtherReceiptParams params);
List<AsnOrder> getAllAsnOrders();
+
+ R getReceiptAreas();
+
+ List<Fields> getDynamicFields();
+
+ R getDeltByCode(String code);
+
+ WaitPakin mergeItems(WaitPakinParam waitPakin);
+
+ WaitPakin unBind(WaitPakinParam param);
+
+ R inspect(String code, Long loginUserId);
+
+ R confirmIspt(String id);
+
+ R checkObjs(CheckObjParams params);
+
+ R checkUpdate(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);
}
--
Gitblit v1.9.1