From acaf0e69a594f36ef9be6749c2b8d66e4ef6123b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:54:33 +0800
Subject: [PATCH] feat: 发货审批根据合同号合并到第一条(未审批)的记录中
---
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index 81c7181..b032b0a 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -3,12 +3,42 @@
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.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.IOException;
+import java.util.List;
/**
* @author :yys
* @date : 2025/10/22 9:33
*/
public interface ShippingInfoService extends IService<ShippingInfo>{
- IPage<ShippingInfo> listPage(Page page, ShippingInfo req);
+ IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req);
+
+ boolean deductStock(ShippingInfoDto req) throws IOException;
+
+ boolean delete(List<Long> ids);
+
+ List<SalesLedgerProductDto> getReturnManagementDtoById( Long shippingId);
+
+ List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
+
+ /**
+ * 涓�閿彂璐� - 鑷姩瀹℃壒閫氳繃骞跺嚭搴�
+ * @param req 鍙戣揣淇℃伅
+ * @return 鏄惁鎴愬姛
+ */
+ boolean oneClickShipping(ShippingInfoDto req) throws IOException;
+
+ /**
+ * 鎵归噺涓�閿彂璐� - 灏嗛攢鍞彴璐︿笅鎵�鏈夋湭鍙戣揣鐨勪骇鍝佸叏閮ㄥ彂璐�
+ * @param salesLedgerId 閿�鍞彴璐D
+ * @param req 鍙戣揣淇℃伅锛堝彂璐х被鍨嬨�佹棩鏈熺瓑锛�
+ * @return 鏄惁鎴愬姛
+ */
+ boolean batchOneClickShipping(Long salesLedgerId, ShippingInfoDto req) throws IOException;
}
--
Gitblit v1.9.3