From 69e1d95373227f364b2fa6d3852be24bafd1a9dc Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 16 三月 2026 17:51:59 +0800
Subject: [PATCH] yys 产品基础数据修改，分批发货开发
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 23 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 9218ce6..c33bb62 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -1,19 +1,23 @@
package com.ruoyi.sales.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.ShippingInfoDetailMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
-import com.ruoyi.sales.service.ICommonFileService;
+import com.ruoyi.sales.pojo.ShippingInfoDetail;
+import com.ruoyi.sales.service.ShippingInfoDetailService;
import com.ruoyi.sales.service.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -21,7 +25,12 @@
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -35,18 +44,39 @@
private ShippingInfoMapper shippingInfoMapper;
@Autowired
- private TempFileServiceImpl tempFileService;
- @Autowired
private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
private StockUtils stockUtils;
@Autowired
private CommonFileServiceImpl commonFileService;
- @Override
- public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req);
+ @Autowired
+ private ApproveProcessServiceImpl approveProcessService;
+ @Autowired
+ private ShippingInfoDetailMapper shippingInfoDetailMapper;
+
+ @Autowired
+ private ShippingInfoDetailService shippingInfoDetailService;
+
+ @Override
+ public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
+ IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
+ listPage.getRecords().forEach(item ->{
+ item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
+ List<ShippingInfoDetail> shippingInfoDetails = shippingInfoDetailMapper.selectList(new LambdaQueryWrapper<ShippingInfoDetail>()
+ .eq(ShippingInfoDetail::getShippingInfoId, item.getId()));
+ // 鏍稿績浼樺寲锛氬眰灞傞槻鎶ょ┖鎸囬拡 + 澶勭悊绌洪泦鍚堝満鏅�
+ item.setShippingSuccessTotal(Optional.ofNullable(shippingInfoDetails)
+ .orElse(Collections.emptyList())
+ .stream()
+ .filter(Objects::nonNull)
+ .map(ShippingInfoDetail::getShippingNum)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)); // 鐢↙ambda鏇夸唬鏂规硶寮曠敤
+ item.setWaitShippingTotal(item.getShippingTotal().subtract(item.getShippingSuccessTotal()));
+
+ });
return listPage;
}
@@ -56,28 +86,44 @@
if (byId == null) {
throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
}
+ //鎵ｅ噺搴撳瓨
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
+ stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
byId.setExpressNumber(req.getExpressNumber());
byId.setExpressCompany(req.getExpressCompany());
- byId.setStatus("宸插彂璐�");
+ byId.setStatus(req.getStatus());
byId.setShippingCarNumber(req.getShippingCarNumber());
- boolean update = this.updateById(req);
- //鎵ｅ噺搴撳瓨
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
- stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
- // 杩佺Щ鏂囦欢
- if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
- tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
- }
- return update ;
+ return this.updateById(byId);
}
@Override
public boolean delete(List<Long> ids) {
- commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue());
- for (Long id : ids) {
- stockUtils.deleteStockRecord(id, StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
+ .in(ShippingInfo::getId, ids));
+ if(CollectionUtils.isEmpty(shippingInfos)) return false;
+ // 鍒犻櫎瀛愯〃
+ List<ShippingInfoDetail> shippingInfoDetails = shippingInfoDetailMapper.selectList(new LambdaQueryWrapper<ShippingInfoDetail>()
+ .in(ShippingInfoDetail::getShippingInfoId, ids));
+ if(CollectionUtils.isNotEmpty(shippingInfoDetails)){
+ shippingInfoDetailService.delete(shippingInfoDetails.stream().map(ShippingInfoDetail::getId).collect(Collectors.toList()));
}
- boolean delete = this.removeBatchByIds(ids);
- return delete;
+ // 鎵ｅ凡鍙戣揣搴撳瓨
+ for (ShippingInfo shippingInfo : shippingInfos) {
+ if("宸插彂璐�".equals(shippingInfo.getStatus())) {
+ stockUtils.deleteStockOutRecord(shippingInfo.getId(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ }
+ }
+ // 鍒犻櫎鍙戣揣瀹℃壒
+ if(CollectionUtils.isNotEmpty(shippingInfos)){
+ for (ShippingInfo shippingInfo : shippingInfos){
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .like(ApproveProcess::getApproveReason, shippingInfo.getShippingNo()));
+ if(one != null){
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
+ }
+ }
+
+ return this.removeBatchByIds(ids);
}
}
--
Gitblit v1.9.3