From a11e93f691f128763fa3c441f0936abec7a9655e Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期五, 11 四月 2025 16:38:47 +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 | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 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 e730332..b63ead2 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,10 +1,17 @@ package com.vincent.rsf.server.api.service; import com.vincent.rsf.framework.common.R; -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 @@ -19,5 +26,39 @@ 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(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); } -- Gitblit v1.9.1