From 4b2f98a50ee8e7876eaa177b2044103c36dc3aff Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 18 四月 2026 10:59:11 +0800
Subject: [PATCH] feat: 打印工艺流程未设置默认时获取最新工艺路线数据
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 1cf2d74..8a11486 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -11,8 +12,7 @@
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;
@@ -72,7 +72,8 @@
public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
- return salesLedgerService.importData(file);
+ salesLedgerService.importData(file);
+ return AjaxResult.success();
}
@ApiOperation("瀵煎嚭閿�鍞彴璐︽ā鏉�")
@@ -360,4 +361,54 @@
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);
+ }
+
+ @PostMapping("/salesStock")
+ @ApiOperation("閿�鍞彴璐︿骇鍝佸叆搴�")
+ public AjaxResult salesStock(@RequestBody SalesProductStockDto dto) {
+ salesLedgerService.salesStock(dto);
+ return AjaxResult.success();
+ }
+
+ @GetMapping("/shippedCustomers")
+ @ApiOperation("宸插彂璐у鎴峰悕鍗�")
+ public AjaxResult shippedCustomers() {
+ List<Customer> list = salesLedgerService.shippedCustomers();
+ return AjaxResult.success(list);
+ }
+
}
--
Gitblit v1.9.3