From 0962b43c6b8874e181107b2b6be21cdd6d198c09 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 18:01:34 +0800
Subject: [PATCH] feat: 导入已发货的数据时也新增对应的出入库记录
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 ba96498..3f24246 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -2314,10 +2314,28 @@
if (dbProduct.getProductModelId() == null) {
throw new ServiceException("瀵煎叆澶辫触,璁㈠崟缂栧彿[" + orderNo + "]浜у搧瑙勬牸鏈淮鎶�,鏃犳硶琛ュ綍鍑哄簱");
}
+ // 鍘嗗彶宸插彂璐цˉ褰曪細鐩存帴鍐欏叆鍏ュ簱+鍑哄簱璁板綍
+ stockUtils.addStock(
+ ledger.getId(),
+ dbProduct.getId(),
+ dbProduct.getProductModelId(),
+ allocQty,
+ StockInQualifiedRecordTypeEnum.SALE_STOCK_IN.getCode(),
+ dbProduct.getId()
+ );
+ stockUtils.substractStock(
+ ledger.getId(),
+ dbProduct.getId(),
+ dbProduct.getProductModelId(),
+ allocQty,
+ StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
+ dbProduct.getId()
+ );
BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
BigDecimal newShipped = oldShipped.add(allocQty);
dbProduct.setStockedQuantity(defaultDecimal(dbProduct.getQuantity()));
dbProduct.setShippedQuantity(newShipped);
+ dbProduct.setApproveStatus(3);
updateProductStockStatus(dbProduct);
dbProduct.fillRemainingQuantity();
updateProductShipStatus(dbProduct);
@@ -2345,9 +2363,16 @@
BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
return shipped.compareTo(qty) >= 0;
});
+ boolean anyInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().anyMatch(p -> defaultDecimal(p.getStockedQuantity()).compareTo(BigDecimal.ZERO) > 0);
+ boolean allInbound = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
+ BigDecimal qty = defaultDecimal(p.getQuantity());
+ BigDecimal stocked = defaultDecimal(p.getStockedQuantity());
+ return qty.compareTo(BigDecimal.ZERO) <= 0 || stocked.compareTo(qty) >= 0;
+ });
if (allShipped && rowList.get(0).getReportDate() != null) {
ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
}
+ ledger.setStockStatus(allInbound ? 2 : (anyInbound ? 1 : 0));
ledger.setDeliveryStatus(allShipped ? 5 : 1);
salesLedgerMapper.updateById(ledger);
}
--
Gitblit v1.9.3