From da3901e08f9a870579770ae11bbf13a117063809 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 23 六月 2026 17:44:37 +0800
Subject: [PATCH] Revert "feat: 交付日期修改为入库日期起始"
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 faaae71..c654b7d 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -274,8 +274,12 @@
if (!bindList.isEmpty()) {
List<Integer> processIds = bindList.stream().map(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId).collect(Collectors.toList());
Map<Integer, Integer> processQuantityMap = bindList.stream().collect(Collectors.toMap(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId, SalesLedgerProductProcessBind::getQuantity, (a, b) -> a));
+ Map<Integer, BigDecimal> processAmountMap = bindList.stream().collect(Collectors.toMap(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId, SalesLedgerProductProcessBind::getAmount, (a, b) -> a));
List<SalesLedgerProductProcess> processList = salesLedgerProductProcessService.listByIds(processIds);
- processList.forEach(p -> p.setQuantity(processQuantityMap.get(p.getId())));
+ processList.forEach(p -> {
+ p.setQuantity(processQuantityMap.get(p.getId()));
+ if (processAmountMap.get(p.getId()) != null) p.setUnitPrice(processAmountMap.get(p.getId()));
+ });
product.setSalesProductProcessList(processList);
}
ProductModel productModel = productModelMap.get(product.getProductModelId());
@@ -652,6 +656,7 @@
SalesLedgerProductProcess p = new SalesLedgerProductProcess();
p.setId(process.getId());
p.setQuantity(processQty.intValue());
+ p.setUnitPrice(process.getUnitPrice());
processList.add(p);
extraProcessAmountPerPiece = extraProcessAmountPerPiece.add(defaultDecimal(process.getUnitPrice()).multiply(processQty));
}
@@ -1910,11 +1915,7 @@
BigDecimal stockedQty = item.getStockedQuantity() == null ? BigDecimal.ZERO : item.getStockedQuantity();
return orderQty.compareTo(BigDecimal.ZERO) <= 0 || stockedQty.compareTo(orderQty) >= 0;
});
- int newStockStatus = allStocked ? 2 : (hasStocked ? 1 : 0);
- if (newStockStatus > 0 && ledger.getDeliveryDate() == null) {
- ledger.setDeliveryDate(LocalDate.now().plusDays(7));
- }
- ledger.setStockStatus(newStockStatus);
+ ledger.setStockStatus(allStocked ? 2 : (hasStocked ? 1 : 0));
baseMapper.updateById(ledger);
}
@@ -2079,11 +2080,7 @@
return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
});
boolean allLinesFull = ledgerAllProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
- int newStockStatus = allLinesFull ? 2 : (anyInbound ? 1 : 0);
- if (newStockStatus > 0 && salesLedger.getDeliveryDate() == null) {
- salesLedger.setDeliveryDate(LocalDate.now().plusDays(7));
- }
- salesLedger.setStockStatus(newStockStatus);
+ salesLedger.setStockStatus(allLinesFull ? 2 : (anyInbound ? 1 : 0));
baseMapper.updateById(salesLedger);
}
@@ -3090,6 +3087,7 @@
SalesLedgerProductProcess bind = new SalesLedgerProductProcess();
bind.setId(process.getId());
bind.setQuantity(entry.getValue());
+ bind.setUnitPrice(process.getUnitPrice());
result.add(bind);
}
return result;
@@ -4675,3 +4673,4 @@
}
}
+
--
Gitblit v1.9.3