From 44ceeeee9cd3f76b0f3a2135421407b73dea9bb0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 11:41:58 +0800
Subject: [PATCH] fix(sales): 修复销售台账发货状态查询逻辑
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 44b8563..af93f28 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -166,6 +166,24 @@
return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
}
+ @PostMapping("/createFrameworkOrder")
+ @Operation(summary = "鍒涘缓妗嗘灦璁㈠崟")
+ public AjaxResult createFrameworkOrder(@RequestBody SalesLedgerDto salesLedgerDto) {
+ return toAjax(salesLedgerService.createFrameworkOrder(salesLedgerDto));
+ }
+
+ @GetMapping("/listFrameworkOrders")
+ @Operation(summary = "鏌ヨ妗嗘灦鍚堝悓涓嬬殑妗嗘灦璁㈠崟")
+ public AjaxResult listFrameworkOrders(@RequestParam("parentContractId") Long parentContractId) {
+ return AjaxResult.success(salesLedgerService.listFrameworkOrders(parentContractId));
+ }
+
+ @GetMapping("/frameworkContractShippedQuantity")
+ @Operation(summary = "鏌ヨ妗嗘灦鍚堝悓绱宸插彂璐ф暟閲�")
+ public AjaxResult frameworkContractShippedQuantity(@RequestParam("parentContractId") Long parentContractId) {
+ return AjaxResult.success(salesLedgerService.getFrameworkContractShippedQuantity(parentContractId));
+ }
+
/**
* 鍒犻櫎閿�鍞彴璐�
*/
@@ -262,7 +280,7 @@
// 濡傛灉宸茬粡鏈夎繃寮�绁ㄦ垨鍥炴鎿嶄綔,鍒欎笉鍏佽缂栬緫
boolean hasReceiptOperation = receiptPaymentAmountTotal.compareTo(BigDecimal.ZERO) > 0;
- salesLedgerVo.setIsEdit(hasReceiptOperation);
+ salesLedgerVo.setIsEdit(!hasReceiptOperation);
salesLedgerVo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, ledgerId));
}
--
Gitblit v1.9.3