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/SalesLedgerServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 07ab3af..dd9947b 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -52,11 +52,13 @@
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.CommonFileMapper;
+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.CommonFile;
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.ISalesLedgerService;
@@ -104,7 +106,10 @@
private static final String LEDGER_TYPE_OIL = "鍗栨补";
/** 閿�鍞被鍨嬶細浠ｅ偍锛堝崠瀛樺偍浣嶇疆锛岃蛋娌瑰簱+鍌ㄧ綈+鎵嬪伐鍚堝悓閲戦锛� */
private static final String LEDGER_TYPE_DEPOSIT = "浠ｅ偍";
+ /** 鍙戣揣鐘舵�侊細鏈夊埌璐ц褰曞嵆瑙嗕负宸插彂璐э紙娌瑰搧鍑哄簱涓嶅啀浜у彂璐у崟锛� */
+ private static final String SHIPPING_STATUS_SHIPPED = "宸插彂璐�";
private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerArrivalMapper salesLedgerArrivalMapper;
private final CustomerMapper customerMapper;
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;
@@ -190,13 +195,14 @@
for (SalesLedgerProduct product : products) {
product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
product.setRegisterDate(LocalDateTime.now());
- // 鍙戣揣淇℃伅
- ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
- .orderByDesc(ShippingInfo::getCreateTime)
+ // 鍙戣揣鐘舵�侊細娌瑰搧鍑哄簱涓嶅啀浜у彂璐у崟锛屾敼涓恒�屾湁鍒拌揣璁板綍鍗冲凡鍙戣揣銆�
+ SalesLedgerArrival arrival = salesLedgerArrivalMapper.selectOne(new LambdaQueryWrapper<SalesLedgerArrival>()
+ .eq(SalesLedgerArrival::getSalesLedgerProductId, product.getId())
+ .orderByDesc(SalesLedgerArrival::getArrivalDate)
+ .orderByDesc(SalesLedgerArrival::getId)
.last("limit 1"));
- if (shippingInfo != null) {
- product.setShippingStatus(shippingInfo.getStatus());
+ if (arrival != null) {
+ product.setShippingStatus(SHIPPING_STATUS_SHIPPED);
}
}
@@ -505,15 +511,16 @@
for (SalesLedgerProduct product : products) {
product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
product.setRegisterDate(LocalDateTime.now());
- // 鍙戣揣淇℃伅
- ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
- .orderByDesc(ShippingInfo::getCreateTime)
+ // 鍙戣揣淇℃伅锛氭补鍝佸嚭搴撲笉鍐嶄骇鍙戣揣鍗曪紝鏀规寜鏈�鏂颁竴鏉″埌璐ц褰曞洖濉�
+ SalesLedgerArrival arrival = salesLedgerArrivalMapper.selectOne(new LambdaQueryWrapper<SalesLedgerArrival>()
+ .eq(SalesLedgerArrival::getSalesLedgerProductId, product.getId())
+ .orderByDesc(SalesLedgerArrival::getArrivalDate)
+ .orderByDesc(SalesLedgerArrival::getId)
.last("limit 1"));
- product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
- product.setShippingDate(shippingInfo.getShippingDate());
- if (shippingInfo != null) {
- product.setShippingStatus(shippingInfo.getStatus());
+ if (arrival != null) {
+ product.setShippingCarNumber(arrival.getTruckPlateNo());
+ product.setShippingDate(arrival.getArrivalDate() == null ? null : java.sql.Date.valueOf(arrival.getArrivalDate()));
+ product.setShippingStatus(SHIPPING_STATUS_SHIPPED);
}
}
// 杩囨护鍙繚鐣欏彂璐ц褰�
@@ -700,6 +707,7 @@
salesLedger.setOilDepotName(null);
salesLedger.setTankId(null);
salesLedger.setTankNo(null);
+ salesLedger.setTonnage(null);
// updateById 浼氳烦杩� null锛屽淇敼鏄┖鎿嶄綔锛涙柊澧炴椂涓庢敼閫犲墠涓�鑷达紙鏈氨涓� null锛�
salesLedger.setContractAmount(null);
return;
--
Gitblit v1.9.3