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/ShippingInfoServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index 15b56ea..54337d8 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -20,9 +20,11 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.procurementrecord.bean.vo.ShippingProductVo;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.sales.dto.SalesLedgerArrivalDto;
import com.ruoyi.sales.dto.ShippingApproveDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.dto.ShippingProductDetailDto;
+import com.ruoyi.sales.mapper.SalesLedgerArrivalMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.mapper.ShippingProductDetailMapper;
@@ -36,7 +38,12 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -47,9 +54,14 @@
@RequiredArgsConstructor
public class ShippingInfoServiceImpl extends ServiceImpl<ShippingInfoMapper, ShippingInfo> implements ShippingInfoService {
+ /**
+ * listPage 鐨勮鏉ユ簮鏍囪锛歴hipping=鍙戣揣鍗曪紝oilOut=閿�鍞被娌瑰搧鍑哄簱
+ */
+ private static final String SOURCE_OIL_OUT = "oilOut";
private final ShippingInfoMapper shippingInfoMapper;
+ private final SalesLedgerArrivalMapper salesLedgerArrivalMapper;
private final SalesLedgerProductMapper salesLedgerProductMapper;
@@ -67,9 +79,56 @@
public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
listPage.getRecords().forEach(item -> {
+ if (SOURCE_OIL_OUT.equals(item.getSource())) {
+ // 娌瑰搧鍑哄簱琛岀殑 id 鏄� stock_out_record.id锛屼笌 shipping_info.id 鍚屽煙浼氭挒鍙凤紝
+ // 鐢ㄥ畠鍘绘煡闄勪欢鍙細鎹炲嚭鍒殑鍙戣揣鍗曠殑鍥撅紝绱㈡�т笉鏌ワ紱闄勪欢鎸傚湪鍒拌揣璁板綍瀛愯涓�
+ // 娌瑰搧鍑哄簱琛屾病鏈� shipping_product_detail锛屾壒鍙锋槑缁嗗彧鑳界敱鍑哄簱璁板綍鑷韩瀛楁鏋勯��
+ item.setBatchNoList(buildOilOutBatchNoList(item));
+ return;
+ }
item.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, item.getId()));
});
+ assembleArrivals(listPage.getRecords());
return listPage;
+ }
+
+ /**
+ * 鍙戣揣鍙拌处灞傜骇鍖栵細鐖惰 = 涓�娆″彂璐э紙鍙戣揣鍗� / 娌瑰搧鍑哄簱鍗曪級锛屽瓙琛� = 璇ュ嚭搴撳崟涓嬬殑鍒拌揣璁板綍銆�
+ * <p>
+ * 鍒绘剰涓嶆妸鍒拌揣璁板綍 UNION 杩涘垎椤� SQL锛氱幇鏈� UNION 鐨勬瘡涓�琛屽ぉ鐒跺氨鏄竴涓埗琛岋紝鐖惰缁村害鐨勫垎椤典笌
+ * total 宸茬粡姝ｇ‘锛涙贩鍏ュ瓙琛屼細鎾戝ぇ鏉℃暟锛屼笖 {@code getDateilByShippingNo} 澶嶇敤鍚屼竴 listPage 鍙�
+ * 绗竴琛屾椂浼氶潤榛樺彇閿欍�傛敼鎴愪粠宸插垎椤电殑鐖惰閲屾敹闆� id锛屼竴娆℃壒閲忔煡瀛愯锛岄伩鍏� N+1銆�
+ */
+ private void assembleArrivals(List<ShippingInfoDto> records) {
+ List<Long> stockOutRecordIds = records.stream()
+ .filter(item -> SOURCE_OIL_OUT.equals(item.getSource()) && item.getStockOutRecordId() != null)
+ .map(ShippingInfoDto::getStockOutRecordId)
+ .toList();
+ if (stockOutRecordIds.isEmpty()) {
+ return;
+ }
+ Map<Long, List<SalesLedgerArrivalDto>> arrivalMap = salesLedgerArrivalMapper
+ .listByStockOutRecordIds(stockOutRecordIds).stream()
+ .collect(Collectors.groupingBy(SalesLedgerArrivalDto::getStockOutRecordId));
+ records.forEach(item -> {
+ if (!SOURCE_OIL_OUT.equals(item.getSource()) || item.getStockOutRecordId() == null) {
+ return;
+ }
+ List<SalesLedgerArrivalDto> arrivals = arrivalMap.get(item.getStockOutRecordId());
+ item.setChildren(arrivals == null ? new ArrayList<>() : new ArrayList<>(arrivals));
+ });
+ }
+
+ /**
+ * 娌瑰搧鍑哄簱琛岀殑鎵瑰彿鏄庣粏锛屼緵鍙戣揣鍙拌处璇︽儏寮规鐨勩�屾壒鍙枫�嶆槑缁嗚〃灞曠ず
+ */
+ private List<ShippingProductDetailDto> buildOilOutBatchNoList(ShippingInfoDto item) {
+ ShippingProductDetailDto detail = new ShippingProductDetailDto();
+ detail.setBatchNo(item.getOutBatchNo());
+ detail.setProductName(item.getProductName());
+ detail.setSpecificationModel(item.getSpecificationModel());
+ detail.setDeliveryQuantity(item.getTotalQuantity());
+ return Collections.singletonList(detail);
}
@Override
@@ -171,25 +230,77 @@
@Override
public boolean addReq(ShippingInfoDto req) {
+ // 鏍￠獙璇ヤ骇鍝佹槸鍚﹀凡鏈夊緟瀹℃牳/瀹℃牳涓殑鍙戣揣璁板綍锛岄槻姝㈤噸澶嶆彁浜�
+ Long salesLedgerProductId = req.getSalesLedgerProductId();
+ if (salesLedgerProductId != null) {
+ long pendingCount = this.count(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerProductId, salesLedgerProductId)
+ .in(ShippingInfo::getStatus, "寰呭鏍�", "瀹℃牳涓�"));
+ if (pendingCount > 0) {
+ throw new RuntimeException("璇ヤ骇鍝佸凡鏈夊緟瀹℃牳鐨勫彂璐ц褰曪紝璇峰嬁閲嶅鎻愪氦");
+ }
+ }
- LoginUser loginUser = SecurityUtils.getLoginUser();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no",req.getCreateTime());
// 鍏堜繚瀛樺彂璐у崟锛屽啀鍙戣捣瀹℃壒锛涙棤瀹℃牳浜鸿嚜鍔ㄩ�氳繃鏃堕渶瑕佹寜鍙戣揣缂栧彿鍥炲啓鍙戣揣鐘舵�併��
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
boolean save = this.add(req);
// 鍙戣揣瀹℃壒
+ ApprovalTemplate approvalTemplate = approvalTemplateMapper.selectOne(
+ new LambdaQueryWrapper<ApprovalTemplate>()
+ .eq(ApprovalTemplate::getBusinessType, 7L)
+ .eq(ApprovalTemplate::getDeleted, 0)
+ .orderByDesc(ApprovalTemplate::getId)
+ .last("LIMIT 1")
+ );
+ if (approvalTemplate == null) {
+ throw new RuntimeException("璇峰厛閰嶇疆鍙戣揣瀹℃壒妯℃澘");
+ }
ApprovalInstanceDto approvalInstance = new ApprovalInstanceDto();
- approvalInstance.setTemplateId(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getId());
- approvalInstance.setTemplateName(approvalTemplateMapper.selectOne(new LambdaQueryWrapper<ApprovalTemplate>().eq(ApprovalTemplate::getBusinessType,6L).orderByDesc(ApprovalTemplate::getId).last("LIMIT 1")).getTemplateName());
+ approvalInstance.setTemplateId(approvalTemplate.getId());
+ approvalInstance.setTemplateName(approvalTemplate.getTemplateName());
approvalInstance.setBusinessId(req.getId());
approvalInstance.setBusinessType(7L);
approvalInstance.setCurrentLevel(1);
- approvalInstance.setTitle(sh+"瀹℃壒");
+ approvalInstance.setTitle(sh);
approvalInstance.setApplicantId(loginUser.getUserId());
approvalInstance.setApplicantName(loginUser.getNickName());
approvalInstance.setApplyTime(LocalDateTime.now());
approvalInstanceService.add(approvalInstance);
+ // 鍒涘缓瀹℃壒瀹炰緥鍚庯紝鏇存柊鍙戣揣鐘舵�佷负"瀹℃牳涓�"锛屼娇鍓嶇姝ｇ‘鏄剧ず瀹℃壒鐘舵��
+ req.setStatus("瀹℃牳涓�");
+ this.updateById(req);
return true;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long addShippedFromOutbound(ShippingInfoDto req) {
+ // 浠撳偍鐗╂祦鍑哄簱鍗冲彂璐э細涓嶅彂璧峰彂璐у鎵癸紝鐩存帴钀戒负宸插彂璐э紝搴撳瓨鐢� add 鍐呴儴鎵ｅ噺
+ req.setShippingNo(OrderUtils.countTodayByCreateTime(
+ shippingInfoMapper, "SH", "shipping_no", LocalDateTime.now()));
+ req.setStatus("宸插彂璐�");
+ if (req.getShippingDate() == null) {
+ req.setShippingDate(new Date());
+ }
+ this.add(req);
+ return req.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelByOutbound(Long shippingInfoId) {
+ // <=0 蹇呴』鎸′綇锛氭补鍝佸嚭搴撶殑 record_id 鏄� 0 鑰� record_type 鍚屾牱鏄��13銆嶏紝
+ // 浼� 0 杩涙潵浼氭妸鍚岀被鍨嬬殑娌瑰搧鍑哄簱璁板綍褰撴垚鏈彂璐у崟鐨勯厤瀵瑰嚭搴撴暣鎵瑰垹鎺�
+ if (shippingInfoId == null || shippingInfoId <= 0) {
+ return;
+ }
+ // 鍥炴粴璇ュ彂璐у崟鍗犵敤鐨勫簱瀛�
+ stockUtils.deleteStockOutRecord(shippingInfoId, StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ shippingProductDetailMapper.delete(new LambdaQueryWrapper<ShippingProductDetail>()
+ .eq(ShippingProductDetail::getShippingInfoId, shippingInfoId));
+ this.removeById(shippingInfoId);
+ }
}
--
Gitblit v1.9.3