From d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 08:04:54 +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/CheckOrderService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 6f4fa8e..246d4ae 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
@@ -1,8 +1,28 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import org.springframework.web.multipart.MultipartFile;
-public interface CheckOrderService extends IService<AsnOrder> {
+import java.util.HashMap;
+import java.util.List;
+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(List<String> matnrs);
}
--
Gitblit v1.9.1