From 7bf754a7835d06f26240c4ca15bc5f83650de377 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 21 九月 2026 20:52:25 +0800
Subject: [PATCH] docs(api): 更新信托基金与代储台账及油品出库相关接口文档
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 fa60c68..2eccdb4 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -12,10 +12,12 @@
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.sales.mapper.SalesLedgerArrivalMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerArrival;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
@@ -25,6 +27,7 @@
import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyRouting;
+import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,9 +36,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
@@ -59,6 +60,8 @@
private ProductionAccountMapper productionAccountMapper;
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private SalesLedgerArrivalMapper salesLedgerArrivalMapper;
@Autowired
private PurchaseLedgerMapper purchaseLedgerMapper;
@Autowired
@@ -98,30 +101,23 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectSalesLedgerProductList(salesLedgerProduct);
if(!CollectionUtils.isEmpty(salesLedgerProducts)){
salesLedgerProducts.forEach(item -> {
- // 鍙戣揣淇℃伅锛堝彇鏈�鏂颁竴鏉★紝鍙煡璇㈠鏍搁�氳繃鎴栧凡鍙戣揣鐨勮褰曪級
- ShippingInfo latestShippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getSalesLedgerProductId, item.getId())
- .in(ShippingInfo::getStatus, "瀹℃牳閫氳繃", "宸插彂璐�")
- .orderByDesc(ShippingInfo::getCreateTime)
- .last("limit 1"));
- if(latestShippingInfo != null){
- item.setShippingDate(latestShippingInfo.getShippingDate());
- item.setExpressCompany(latestShippingInfo.getExpressCompany());
- item.setExpressNumber(latestShippingInfo.getExpressNumber());
+ // 鍙戣揣淇℃伅锛氭补鍝佸嚭搴撲笉鍐嶄骇鍙戣揣鍗曪紝鏀规寜鍒拌揣璁板綍鍥炲～锛堝埌璐ф棩鏈熷彇鏈�鏂颁竴鏉★紱蹇�掑瓧娈靛鏁磋溅娌瑰搧鏃犳剰涔夛紝鐣欑┖锛�
+ List<SalesLedgerArrival> arrivals = salesLedgerArrivalMapper.selectList(new LambdaQueryWrapper<SalesLedgerArrival>()
+ .eq(SalesLedgerArrival::getSalesLedgerProductId, item.getId())
+ .orderByAsc(SalesLedgerArrival::getArrivalDate)
+ .orderByAsc(SalesLedgerArrival::getId));
+ if(CollectionUtils.isEmpty(arrivals)){
+ return;
}
- // 杞︾墝鍙凤細鍙栨墍鏈夊鏍搁�氳繃鎴栧凡鍙戣揣璁板綍鐨勮溅鐗屽彿锛岄�楀彿鎷兼帴
- List<ShippingInfo> allShippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getSalesLedgerProductId, item.getId())
- .in(ShippingInfo::getStatus, "瀹℃牳閫氳繃", "宸插彂璐�")
- .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);
- }
+ SalesLedgerArrival latest = arrivals.get(arrivals.size() - 1);
+ item.setShippingDate(latest.getArrivalDate() == null ? null : java.sql.Date.valueOf(latest.getArrivalDate()));
+ // 杞︾墝鍙凤細鎵�鏈夊埌璐ц褰曠殑杞︾墝鍙凤紝鍘婚噸鍚庨�楀彿鎷兼帴
+ String carNumbers = arrivals.stream()
+ .map(SalesLedgerArrival::getTruckPlateNo)
+ .filter(carNo -> carNo != null && !carNo.trim().isEmpty())
+ .distinct()
+ .collect(Collectors.joining(","));
+ item.setShippingCarNumber(carNumbers);
});
}
return salesLedgerProducts;
@@ -229,7 +225,7 @@
*/
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
//鍏堝垽鏂浜у搧鏄惁闇�瑕佺敓浜�
- if (!salesLedgerProduct.getIsProduction()) {
+ if (!BooleanUtils.isTrue(salesLedgerProduct.getIsProduction())) {
return;
}
SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());
--
Gitblit v1.9.3