From 352a6420c3241955abd26aaaad997fdc65ffdb3a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 14:27:32 +0800
Subject: [PATCH] feat: 销售订单绑定工艺路线
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..1cf2d74 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -17,6 +17,7 @@
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 +121,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 +155,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 +187,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 +260,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));
}
--
Gitblit v1.9.3