From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
index a4db92a..e078197 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
@@ -3,9 +3,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.GenWaveParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.DeliveryItem;
+import com.vincent.rsf.server.manager.entity.LocItem;
import java.util.List;
@@ -13,9 +17,9 @@
R cancelOutOrder(String id);
- R genOutStock(List<Long> ids, Long loginUserId);
+ R genOutStock(List<DeliveryItem> ids, Long loginUserId);
- R generateWaves(List<Long> ids);
+ R generateWaves(GenWaveParams ids);
R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId);
@@ -23,5 +27,10 @@
R getOrderOutTaskItem(OrderOutTaskParam param);
- R genOutStockTask(List<OutStockToTaskParams> params, Long loginUserId);
+ R genOutStockTask(List<OutStockToTaskParams> params, Long loginUserId, Long outId);
+
+ R getSiteNos();
+
+ R cancelOutOrderByItems(List<AsnOrderItem> orderItems);
+
}
--
Gitblit v1.9.1