From 89758128077c49e17a0e47f5c4f1741894666dd7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 17 一月 2026 11:05:28 +0800
Subject: [PATCH] bug调整
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 90e4b07..9e94a27 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -702,8 +702,9 @@
productOrder.setCompleteQuantity(BigDecimal.ZERO);//瀹屾垚鏁伴噺
productOrderMapper.insert(productOrder);
- ProcessRoute processRoute = processRouteMapper.selectOne(new QueryWrapper<ProcessRoute>().lambda().eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId()));
- List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(salesLedgerProduct.getProductModelId());
+ ProcessRoute processRoute = processRouteMapper.selectList(new QueryWrapper<ProcessRoute>().lambda()
+ .eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId())
+ .orderByDesc(ProcessRoute::getCreateTime)).get(0);
if (processRoute != null) {
//鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎涓昏〃
ProductProcessRoute productProcessRoute = new ProductProcessRoute();
@@ -748,16 +749,7 @@
// 鐢熸垚瀹屾暣鐨勫伐鍗曞彿
String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
- productStructureDtos.stream().forEach(productStructureDto -> {
- if (productStructureDto.getProductModelId().equals(productProcessRouteItem.getProductModelId())){
- productWorkOrder.setQuantity(productStructureDto.getUnitQuantity().multiply(salesLedgerProduct.getQuantity()));
- productWorkOrder.setPlanQuantity(productWorkOrder.getQuantity());
- }
- });
- if (Objects.equals(productProcessRouteItem.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- productWorkOrder.setQuantity(salesLedgerProduct.getQuantity());
- productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
- }
+ productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
productWorkOrder.setProductOrderId(productOrder.getId());
productWorkOrder.setWorkOrderNo(workOrderNoStr);
--
Gitblit v1.9.3