From f0f07a80269905ccb9741a94f797781452837cf5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 28 三月 2026 13:34:17 +0800
Subject: [PATCH] Merge branch 'dhdc' of http://114.132.189.42:9002/r/product-inventory-management-after into dhdc
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 13 ++++++++++---
1 files changed, 10 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 e398a11..356a9de 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -278,7 +277,7 @@
public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct){
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if(CollectionUtils.isEmpty(list)){
- return AjaxResult.error("璇ヤ骇鍝佷笉瀛樺湪");
+ throw new RuntimeException("璇ヤ骇鍝佷笉瀛樺湪");
}
List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
list.forEach(item -> {
@@ -289,7 +288,7 @@
procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
});
if(!CollectionUtils.isEmpty(procurementPageDtoList)){
- return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
}
AtomicInteger num = new AtomicInteger();
list.forEach(item -> {
@@ -306,4 +305,12 @@
}
return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瓒�");
}
+
+ /**
+ * 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣鎯�
+ */
+ @GetMapping("/getSalesByCode")
+ public AjaxResult getSalesByCode(SalesLedgerDto salesLedgerDto) {
+ return AjaxResult.success(salesLedgerService.getSalesByCode(salesLedgerDto));
+ }
}
--
Gitblit v1.9.3