From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 12 ++++++++++--
1 files changed, 10 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 fcd6280..12ed935 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -3,8 +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.procurementrecord.bean.vo.ShippingProductVo;
+import com.ruoyi.sales.dto.ShippingApproveDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
+import com.ruoyi.sales.dto.ShippingProductDetailDto;
import com.ruoyi.sales.pojo.ShippingInfo;
import java.util.List;
@@ -20,9 +22,15 @@
boolean delete(List<Long> ids);
- List<SalesLedgerProductDto> getReturnManagementDtoById( Long shippingId);
+ List<ShippingProductVo> getReturnManagementDtoById(Long shippingId);
List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
boolean add(ShippingInfoDto req);
+
+ List<ShippingProductDetailDto> getDetail(Long id);
+
+ ShippingApproveDto getDateilByShippingNo(String shippingNo);
+
+ boolean addReq(ShippingInfoDto req);
}
--
Gitblit v1.9.3