From 128477234dfccf2b06b608b5569595607d9752cf Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 08 九月 2026 22:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 92c44c3..b8042d8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -98,27 +98,16 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectSalesLedgerProductList(salesLedgerProduct);
if(!CollectionUtils.isEmpty(salesLedgerProducts)){
salesLedgerProducts.forEach(item -> {
- // 鍙戣揣淇℃伅锛堝彇鏈�鏂颁竴鏉★級
- ShippingInfo latestShippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
+ // 鍙戣揣淇℃伅
+ ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
.eq(ShippingInfo::getSalesLedgerProductId, item.getId())
.orderByDesc(ShippingInfo::getCreateTime)
.last("limit 1"));
- if(latestShippingInfo != null){
- item.setShippingDate(latestShippingInfo.getShippingDate());
- item.setExpressCompany(latestShippingInfo.getExpressCompany());
- item.setExpressNumber(latestShippingInfo.getExpressNumber());
- }
- // 杞︾墝鍙凤細鍙栨墍鏈夊彂璐ц褰曠殑杞︾墝鍙凤紝閫楀彿鎷兼帴
- List<ShippingInfo> allShippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getSalesLedgerProductId, item.getId())
- .orderByAsc(ShippingInfo::getCreateTime));
- if(!CollectionUtils.isEmpty(allShippingInfos)){
- String carNumbers = allShippingInfos.stream()
- .map(ShippingInfo::getShippingCarNumber)
- .filter(carNo -> carNo != null && !carNo.trim().isEmpty())
- .distinct()
- .collect(Collectors.joining(","));
- item.setShippingCarNumber(carNumbers);
+ if(shippingInfo != null){
+ item.setShippingDate(shippingInfo.getShippingDate());
+ item.setShippingCarNumber(shippingInfo.getShippingCarNumber());
+ item.setExpressCompany(shippingInfo.getExpressCompany());
+ item.setExpressNumber(shippingInfo.getExpressNumber());
}
});
}
--
Gitblit v1.9.3