From cb8ee71facb5520be75dcc9b77e245edc752650e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 13 五月 2026 15:00:12 +0800
Subject: [PATCH] fix:1.生产订单按照bom结构的单位需求数量更改 2.修改生产订单修改对应报工的数量
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index dac35b7..9485919 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -36,10 +36,10 @@
@RequestMapping("/sales/product")
public class SalesLedgerProductController extends BaseController
{
- private ISalesLedgerProductService salesLedgerProductService;
- private ProcurementRecordService procurementRecordService;
- private StockUtils stockUtils;
- private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+ private final ISalesLedgerProductService salesLedgerProductService;
+ private final ProcurementRecordService procurementRecordService;
+ private final StockUtils stockUtils;
+ private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
/**
@@ -71,10 +71,9 @@
if (CollUtil.isEmpty(list)) {
return AjaxResult.success(list);
}
- //
- List<Long> productIds = list.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
+ List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
- Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getSalesLedgerProductId, item -> item.getSumReturnQuantity()));
+ Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, item -> item.getSumReturnQuantity()));
list.forEach(item -> {
if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
@@ -83,13 +82,6 @@
if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
item.setFutureTicketsAmount(BigDecimal.ZERO);
}
-// ProcurementPageDto procurementDto = new ProcurementPageDto();
-// procurementDto.setSalesLedgerProductId(item.getId());
-// procurementDto.setProductCategory(item.getProductCategory());
-// IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
-// BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");
-
-// ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
if (item.getApproveStatus() != 2) {
if (item.getHasSufficientStock() == 0) {
item.setApproveStatus(0);
@@ -98,7 +90,7 @@
}
}
// 缁熻閫�璐ф暟閲�
- BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
item.setReturnQuality(returnQuality);
item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
--
Gitblit v1.9.3