From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/sales/service/ShippingInfoService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index d9a3a8c..fcd6280 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -3,10 +3,10 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
 import com.ruoyi.sales.dto.ShippingInfoDto;
 import com.ruoyi.sales.pojo.ShippingInfo;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -16,7 +16,13 @@
 public interface ShippingInfoService extends IService<ShippingInfo>{
     IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req);
 
-    boolean deductStock(ShippingInfoDto req) throws IOException;
+    boolean deductStock(ShippingInfoDto req);
 
     boolean delete(List<Long> ids);
+
+    List<SalesLedgerProductDto> getReturnManagementDtoById( Long shippingId);
+
+    List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
+
+    boolean add(ShippingInfoDto req);
 }

--
Gitblit v1.9.3