From 65bf12d8c871308e36fff97d985f49ad6bce6adc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 四月 2026 16:01:09 +0800
Subject: [PATCH] feat: 支持个人对私录入销售订单；支持个人采购；供应商、客户档案、销售采购导入导出修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 137 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 117 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 68b52cb..f2d0f4d 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -171,10 +171,9 @@
}
// 鍙兘灞炰簬澶氫釜涓昏〃
- Set<Long> mainIds = deletedProducts.stream()
- .map(SalesLedgerProduct::getSalesLedgerId)
- .filter(Objects::nonNull)
- .collect(Collectors.toSet());
+ Map<Long, Integer> mainIdTypeMap = deletedProducts.stream()
+ .filter(p -> p.getSalesLedgerId() != null)
+ .collect(Collectors.toMap(SalesLedgerProduct::getSalesLedgerId, SalesLedgerProduct::getType, (existing, replacement) -> existing));
// 2. 鎵ц鍒犻櫎鎿嶄綔
int result = salesLedgerProductMapper.deleteBatchIds(Arrays.asList(ids));
@@ -182,19 +181,44 @@
deleteProductionData(Arrays.asList(ids));
// 3. 瀵规瘡涓富琛↖D杩涜閲戦鏇存柊
- for (Long salesLedgerId : mainIds) {
+ for (Map.Entry<Long, Integer> entry : mainIdTypeMap.entrySet()) {
+ Long salesLedgerId = entry.getKey();
+ Integer type = entry.getValue();
+
LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId);
+ wrapper.eq(SalesLedgerProduct::getType, type);
List<SalesLedgerProduct> remainingProducts = salesLedgerProductMapper.selectList(wrapper);
- // 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
- updateMainContractAmount(
- salesLedgerId,
- remainingProducts,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
- salesLedgerMapper,
- SalesLedger.class
- );
+ if (type == 1) {
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(salesLedger.getSalesType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ salesLedgerMapper,
+ SalesLedger.class
+ );
+ }
+ } else {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null) {
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = Integer.valueOf(2).equals(purchaseLedger.getPurchaseType()) ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+ updateMainContractAmount(
+ salesLedgerId,
+ remainingProducts,
+ amountGetter,
+ purchaseLedgerMapper,
+ PurchaseLedger.class
+ );
+ }
+ }
}
return result;
}
@@ -202,21 +226,86 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrUpdateSalesLedgerProduct(SalesLedgerProduct salesLedgerProduct) {
+ if (salesLedgerProduct.getId() != null) {
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectById(salesLedgerProduct.getId());
+ if (dbProduct != null) {
+ if (salesLedgerProduct.getSalesLedgerId() == null) {
+ salesLedgerProduct.setSalesLedgerId(dbProduct.getSalesLedgerId());
+ }
+ if (salesLedgerProduct.getType() == null) {
+ salesLedgerProduct.setType(dbProduct.getType());
+ }
+ if (salesLedgerProduct.getInvoiceTotal() == null) {
+ salesLedgerProduct.setInvoiceTotal(dbProduct.getInvoiceTotal());
+ }
+ if (salesLedgerProduct.getTicketsTotal() == null) {
+ salesLedgerProduct.setTicketsTotal(dbProduct.getTicketsTotal());
+ }
+ if (salesLedgerProduct.getQuantity() == null) {
+ salesLedgerProduct.setQuantity(dbProduct.getQuantity());
+ }
+ if (salesLedgerProduct.getTotalPrice() == null) {
+ salesLedgerProduct.setTotalPrice(dbProduct.getTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxInclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxInclusiveTotalPrice(dbProduct.getTaxInclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxExclusiveTotalPrice() == null) {
+ salesLedgerProduct.setTaxExclusiveTotalPrice(dbProduct.getTaxExclusiveTotalPrice());
+ }
+ if (salesLedgerProduct.getTaxRate() == null) {
+ salesLedgerProduct.setTaxRate(dbProduct.getTaxRate());
+ }
+ if (salesLedgerProduct.getUnitPrice() == null) {
+ salesLedgerProduct.setUnitPrice(dbProduct.getUnitPrice());
+ }
+ if (salesLedgerProduct.getFreight() == null) {
+ salesLedgerProduct.setFreight(dbProduct.getFreight());
+ }
+ if (salesLedgerProduct.getPriceWithFreight() == null) {
+ salesLedgerProduct.setPriceWithFreight(dbProduct.getPriceWithFreight());
+ }
+ }
+ }
+
+ Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
+ SalesLedger salesLedger = null;
+ PurchaseLedger purchaseLedger = null;
+ boolean isPrivate = false;
+
+ if (salesLedgerProduct.getType() != null && salesLedgerProduct.getType().equals(1)) {
+ salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null && Integer.valueOf(2).equals(salesLedger.getSalesType())) {
+ isPrivate = true;
+ }
+ } else {
+ purchaseLedger = purchaseLedgerMapper.selectById(salesLedgerId);
+ if (purchaseLedger != null && Integer.valueOf(2).equals(purchaseLedger.getPurchaseType())) {
+ isPrivate = true;
+ }
+ }
+
+ BigDecimal totalPrice = isPrivate ?
+ (salesLedgerProduct.getTotalPrice() != null ? salesLedgerProduct.getTotalPrice() : BigDecimal.ZERO) :
+ (salesLedgerProduct.getTaxInclusiveTotalPrice() != null ? salesLedgerProduct.getTaxInclusiveTotalPrice() : BigDecimal.ZERO);
+
+ BigDecimal invoiceTotal = salesLedgerProduct.getInvoiceTotal() != null ? salesLedgerProduct.getInvoiceTotal() : BigDecimal.ZERO;
+ BigDecimal ticketsTotal = salesLedgerProduct.getTicketsTotal() != null ? salesLedgerProduct.getTicketsTotal() : BigDecimal.ZERO;
+
// 寰呭洖娆撅紝浠樻
if(salesLedgerProduct.getType().equals(1)){
- salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ salesLedgerProduct.setPendingInvoiceTotal(totalPrice.subtract(invoiceTotal));
//鏈紑绁ㄦ暟閲�+閲戦
salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setNoInvoiceAmount(totalPrice);
}else{
- salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal()));
+ salesLedgerProduct.setPendingTicketsTotal(totalPrice.subtract(ticketsTotal));
// 鏈潵绁ㄦ暟閲�+閲戦
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ salesLedgerProduct.setFutureTicketsAmount(totalPrice);
}
int result;
- Long salesLedgerId = salesLedgerProduct.getSalesLedgerId();
if (salesLedgerProduct.getId() == null) {
salesLedgerProduct.setRegisterDate(LocalDateTime.now());
result = salesLedgerProductMapper.insert(salesLedgerProduct);
@@ -239,12 +328,17 @@
wrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
.eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());
List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(wrapper);
+
+ Function<SalesLedgerProduct, BigDecimal> amountGetter = isPrivate ?
+ p -> p.getTotalPrice() != null ? p.getTotalPrice() : BigDecimal.ZERO
+ : p -> p.getTaxInclusiveTotalPrice() != null ? p.getTaxInclusiveTotalPrice() : BigDecimal.ZERO;
+
if (salesLedgerProduct.getType() == 1) {
// 璋冪敤閫氱敤鏂规硶鏇存柊涓昏〃閲戦
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
salesLedgerMapper,
SalesLedger.class
);
@@ -253,7 +347,7 @@
updateMainContractAmount(
salesLedgerId,
productList,
- SalesLedgerProduct::getTaxInclusiveTotalPrice,
+ amountGetter,
purchaseLedgerMapper,
PurchaseLedger.class
);
@@ -337,6 +431,9 @@
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
+ if (productIds == null || productIds.isEmpty()){
+ return;
+ }
//鎵归噺鏌ヨproductOrder
List<ProductOrder> productOrders = productOrderMapper.selectList(
new LambdaQueryWrapper<ProductOrder>()
--
Gitblit v1.9.3