From 4edc95df6cdd003dd485fdaaaeafbd75cc368c22 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 17:58:17 +0800
Subject: [PATCH] yys 1.设备备件字段补全
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 061f3ce..5644f45 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;
@@ -284,23 +283,21 @@
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 -> {
ProcurementPageDto procurementDto = new ProcurementPageDto();
- procurementDto.setSalesLedgerProductId(String.valueOf(item.getId()));
- Page<ProcurementPageDto> page = new Page<>(1, 50);
- IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(page, procurementDto);
+ IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(new Page<>(1, -1), procurementDto);
procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
});
- if(!CollectionUtils.isEmpty(procurementPageDtoList)){
- return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
+ if(CollectionUtils.isEmpty(procurementPageDtoList)){
+ throw new RuntimeException("璇ヤ骇鍝佸簱瀛樹笉瀛樺湪");
}
AtomicInteger num = new AtomicInteger();
list.forEach(item -> {
procurementPageDtoList.forEach(procurementPageDto -> {
- if(String.valueOf(item.getId().intValue()).equals(procurementPageDto.getSalesLedgerProductId())){
+ if(item.getProductModelId().equals(procurementPageDto.getProductModelId())){
if (item.getQuantity().compareTo(procurementPageDto.getInboundNum0()) <= 0) {
num.getAndIncrement();
}
@@ -312,4 +309,12 @@
}
return AjaxResult.error("璇ヤ骇鍝佸簱瀛樹笉瓒�");
}
+
+ /**
+ * 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇㈣鎯�
+ */
+ @GetMapping("/getSalesByCode")
+ public AjaxResult getSalesByCode(SalesLedgerDto salesLedgerDto) {
+ return AjaxResult.success(salesLedgerService.getSalesByCode(salesLedgerDto));
+ }
}
--
Gitblit v1.9.3