From ff5614116fe3f9a8d515ba7feb3c2e408d6af16a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 28 三月 2026 10:50:56 +0800
Subject: [PATCH] fix: 销售台账产品信息数据返回缺失

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index cbef46f..09d9c23 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -11,12 +11,12 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.sales.dto.InvoiceLedgerDto;
-import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.*;
 import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
 import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProcessRoute;
 import com.ruoyi.sales.service.ICommonFileService;
 import com.ruoyi.sales.service.ISalesLedgerService;
 import io.swagger.annotations.Api;
@@ -120,12 +120,12 @@
         startPage();
         List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
         // 璁＄畻宸插紑绁ㄩ噾棰�/鏈紑绁ㄩ噾棰�(宸插～鍐欏彂绁ㄩ噾棰濅负鍑�)
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isEmpty(list)) {
             return getDataTable(list);
         }
         List<Long> salesLedgerIds = list.stream().map(SalesLedger::getId).collect(Collectors.toList());
         List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
-        if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+        if (CollectionUtils.isEmpty(invoiceLedgerDtoList)) {
             return getDataTable(list);
         }
         for (SalesLedger salesLedger : list) {
@@ -154,10 +154,10 @@
     @Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
-        Page page = new Page(-1,-1);
+        Page page = new Page(-1, -1);
         IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
         ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
-        if(salesLedgerIPage == null){
+        if (salesLedgerIPage == null) {
             util.exportExcel(response, new ArrayList<>(), "閿�鍞彴璐︽暟鎹�");
             return;
         }
@@ -186,6 +186,16 @@
     @PostMapping("/addOrUpdateSalesLedger")
     public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
         return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
+    }
+
+    /**
+     * 閿�鍞鍗曠粦瀹氬伐鑹鸿矾绾�
+     */
+    @PostMapping("/saleProcessBind")
+    @ApiOperation("閿�鍞鍗曠粦瀹氬伐鑹鸿矾绾�")
+    public AjaxResult saleProcessBind(@RequestBody SalesLedgerProcessRoute salesLedgerProcessRoute) {
+        salesLedgerService.saleProcessBind(salesLedgerProcessRoute);
+        return AjaxResult.success();
     }
 
     /**
@@ -249,7 +259,7 @@
      * 杩戝崐骞村紑绁�,鍥炴閲戦
      */
     @GetMapping("/getAmountHalfYear")
-    public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+    public AjaxResult getAmountHalfYear(@RequestParam(value = "type", defaultValue = "1") Integer type) {
         return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
     }
 
@@ -349,4 +359,40 @@
     public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
         return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
     }
+
+    @ApiOperation("鑾峰彇閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
+    @GetMapping("/salesProcess/{salesLedgerId}")
+    public AjaxResult salesProcess(@PathVariable Long salesLedgerId) {
+        SalesLedgerProcessRouteDto dto = salesLedgerService.salesProcess(salesLedgerId);
+        return AjaxResult.success(dto);
+    }
+
+    @GetMapping("/processCard/{salesLedgerId}")
+    @ApiOperation("鎵撳嵃鐢熶骇娴佺▼鍗�")
+    public AjaxResult processCard(@PathVariable Long salesLedgerId) {
+        SalesProcessCardDto dto = salesLedgerService.processCard(salesLedgerId);
+        return AjaxResult.success(dto);
+    }
+
+    @GetMapping("/salesOrders/{salesLedgerId}")
+    @ApiOperation("鎵撳嵃閿�鍞鍗�")
+    public AjaxResult salesOrders(@PathVariable Long salesLedgerId) {
+        SalesOrdersDto salesOrdersDto = salesLedgerService.salesOrders(salesLedgerId);
+        return AjaxResult.success(salesOrdersDto);
+    }
+
+    @PostMapping("/salesInvoices")
+    @ApiOperation("鎵撳嵃閿�鍞彂璐у崟")
+    public AjaxResult salesInvoices(@RequestBody List<Long> salesLedgerIds) {
+        SalesInvoicesDto dto = salesLedgerService.salesInvoices(salesLedgerIds);
+        return AjaxResult.success(dto);
+    }
+
+    @GetMapping("/salesLabel/{salesLedgerId}")
+    @ApiOperation("鎵撳嵃璁㈠崟鏍囩")
+    public AjaxResult salesLabel(@PathVariable Long salesLedgerId) {
+        List<SalesLabelDto> list = salesLedgerService.salesLabel(salesLedgerId);
+        return AjaxResult.success(list);
+    }
+
 }

--
Gitblit v1.9.3