From 7970a628418ea57b1e2e13dffb7d99e30db8a4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 12:52:46 +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 | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 2b3058d..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
@@ -1,16 +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
@@ -25,7 +26,7 @@
R getOrderByCode(String barcode);
- R receiptToWarehouse(ReceiptParams orders);
+ R receiptToWarehouse(Map<String, Object> orders, Long loginUserId);
R otherReceipt(OtherReceiptParams params);
@@ -35,11 +36,42 @@
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);
R inspect(String code, Long loginUserId);
+
+ R confirmIspt(String id);
+
+ R checkObjs(CheckObjParams 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 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