From 3217d11481d7440f1526499d14a0c398369aa0e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 30 四月 2025 14:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index d476e5f..2132c30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -3,6 +3,7 @@
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.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import java.util.List;
@@ -14,7 +15,14 @@
List<AsnOrder> getListByMatnr(Map<String, String> params);
- R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId);
+ R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
- R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);
+ R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
+
+ boolean batchUpdate(BatchUpdateParam params, Long loginUserId);
+
+ R completeOrder(Long id, Long loginUserId);
+
+ R closeOrder(Long id);
+
}
--
Gitblit v1.9.1