From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
index c847096..046c20f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
@@ -2,15 +2,28 @@
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.entity.AsnOrder;
+import com.vincent.rsf.server.manager.controller.params.*;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
+import java.util.List;
-public interface CheckOrderService extends IService<AsnOrder> {
+public interface CheckOrderService extends IService<WkOrder> {
R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId);
R saveCheckOrder(AsnOrderAndItemsParams params, Long loginUserId);
+
+ R cancelCheckOrder(Long id);
+
+ R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId);
+
+ R getSiteNos();
+
+ R genCheckPreview(OrderOutTaskParam param);
+
+ R getAllLocByMatnr(CheckLocQueryParams matnrs);
+
+ R genCheckOutTask(List<CheckOrderParams> checkParams, Long loginUserId);
}
--
Gitblit v1.9.1