From f2b48ce0cfdf9b68ecc7c9d84937d69500590f81 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:28 +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/AsnOrderItemService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
index 4293bf3..2978b52 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
@@ -6,8 +6,6 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import org.springframework.web.multipart.MultipartFile;
@@ -18,9 +16,9 @@
public interface AsnOrderItemService extends IService<AsnOrderItem> {
- R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception;
+ R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;
- boolean fieldsSave(Map<String, Object> params);
+ boolean fieldsSave(Map<String, Object> params, Long loginUserId);
R generateBarcode(List<Long> orders);
--
Gitblit v1.9.1