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/AsnOrderItemService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 c677466..54282b5 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
@@ -1,18 +1,27 @@
package com.vincent.rsf.server.manager.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-public interface AsnOrderItemService extends IService<AsnOrderItem> {
+public interface AsnOrderItemService extends IService<WkOrderItem> {
- R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception;
- boolean fieldsSave(Map<String, Object> params);
+ R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;
+
+ boolean fieldsSave(Map<String, Object> params, Long loginUserId);
+
+ R generateBarcode(List<Long> orders);
+
+ IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper);
+
}
--
Gitblit v1.9.1