From 25f91c2eb2e458ee065e787bd547f8fe0625e918 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 5cfcc4c..c482666 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
@@ -6,13 +6,13 @@
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.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import java.util.List;
-public interface OutStockService extends IService<AsnOrder> {
+public interface OutStockService extends IService<WkOrder> {
R cancelOutOrder(String id);
@@ -30,5 +30,6 @@
R getSiteNos();
- R cancelOutOrderByItems(List<AsnOrderItem> orderItems);
+ R cancelOutOrderByItems(List<WkOrderItem> orderItems);
+
}
--
Gitblit v1.9.1