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 | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 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..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,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); @@ -50,4 +49,14 @@ 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