From 6ef4265f1859e88e3e5ff22ef1848e12fa849e26 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 12 五月 2026 07:03:43 +0800
Subject: [PATCH] feat: 扫码出库修改为扫码发货
---
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index b38e4af..ca9de2d 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -3,12 +3,20 @@
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.MonthlyAmountDto;
-import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.common.enums.SaleEnum;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 閿�鍞彴璐ervice鎺ュ彛
@@ -24,6 +32,12 @@
int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto);
+ List<SalesLedgerProduct> getSalesLedgerProductListByRelateId(@NotNull Long relateId, @NotNull SaleEnum type);
+
+ List<SalesLedgerProduct> getSalesLedgerProductListByIds(@Nullable List<Long> relateIds, @NotNull SaleEnum type);
+
+ void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type);
+
SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto);
List getSalesNo();
@@ -32,7 +46,59 @@
List getTopFiveList();
- List<MonthlyAmountDto> getAmountHalfYear();
+ List<MonthlyAmountDto> getAmountHalfYear(Integer type);
IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto);
+
+ void importData(MultipartFile file);
+
+ List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
+
+ IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page);
+
+ void saleProcessBind(SalesLedgerProcessRoute salesLedgerProcessRoute);
+
+ SalesProcessCardDto processCard(Long salesLedgerId);
+
+ SalesLedgerProcessRouteDto salesProcess(Long salesLedgerId);
+
+ SalesOrdersDto salesOrders(Long salesLedgerId);
+
+ SalesInvoicesDto salesInvoices(List<Long> salesLedgerIds);
+
+ List<SalesLabelDto> salesLabel(Long salesLedgerId);
+
+ void salesStock(SalesProductStockDto dto);
+
+ void executeSalesStockApproved(Long salesLedgerId, List<Long> salesLedgerProductIds);
+
+ void executeSalesScanInboundApproved(Long salesLedgerId, Map<Long, BigDecimal> inboundQtyByLineId);
+
+ void executeSalesScanInboundUnqualifiedApproved(Long salesLedgerId, Map<Long, BigDecimal> inboundQtyByLineId);
+
+ List<Customer> shippedCustomers();
+
+ void scanInbound(SalesScanInboundDto dto);
+
+ void scanInboundUnqualified(SalesScanInboundDto dto);
+
+ void scanOutbound(SalesScanInboundDto dto);
+
+ void scanOutboundUnqualified(SalesScanInboundDto dto);
+
+ /**
+ * APP 鎵爜鍙戣揣锛氬彂璧峰彂璐у鎵癸紙瀹℃壒閫氳繃鍚庤嚜鍔ㄦ墸搴撳瓨銆佸彂璐у彴璐︿笌璁㈠崟鐘舵�佷负宸插彂璐э級
+ */
+ void scanShipApply(SalesScanShipDto dto);
+
+ /**
+ * 鍙戣揣瀹℃壒锛堢被鍨� 7锛夎妭鐐圭姸鎬佸彉鏇达細鎵爜鍙戣揣娴佺▼ {@code approveRemark} 浠� {@code SCAN_SHIP_DELIVERY_JSON:} 寮�澶存椂鍥炶皟銆�
+ *
+ * @param outcomeStatus 瀹℃壒娴佺姸鎬侊細1 瀹℃牳涓� 2 閫氳繃 3 鎷掔粷
+ */
+ void onScanShipDeliveryApproveOutcome(ApproveProcess approveProcess, Integer outcomeStatus);
+
+ void shippingImport(MultipartFile file);
+
+ void notShippingImport(MultipartFile file);
}
--
Gitblit v1.9.3