From 1b5a58ec0da1ae8eb40a66e41dcd23bb7c2b2e94 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 17:39:33 +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/manager/service/AsnOrderService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 9e87f4a..1ebb220 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
@@ -2,13 +2,24 @@
 
 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;
+import java.util.Map;
 
 public interface AsnOrderService extends IService<AsnOrder> {
 
     boolean notifyInspect(List<AsnOrder> orders);
 
-    R generateBarcode(List<AsnOrder> orders);
+    List<AsnOrder> getListByMatnr(Map<String, String> params);
+
+    R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
+
+    R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
+
+    boolean batchUpdate(BatchUpdateParam params, Long loginUserId);
+
+    R completeOrder(Long id, Long loginUserId);
 }

--
Gitblit v1.9.1