From 7a792a188e75c25623b92901ccb08361d31ad4df Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 10:17:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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 8469b9e..9218ce6 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -3,12 +3,25 @@
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.common.enums.FileNameType;
+import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+import com.ruoyi.framework.web.domain.AjaxResult;
+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.ShippingInfoMapper;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.List;
/**
* @author :yys
@@ -21,10 +34,50 @@
@Autowired
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);
return listPage;
}
+
+ @Override
+ public boolean deductStock(ShippingInfoDto req) throws IOException {
+ ShippingInfo byId = this.getById(req.getId());
+ if (byId == null) {
+ throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
+ }
+ byId.setExpressNumber(req.getExpressNumber());
+ byId.setExpressCompany(req.getExpressCompany());
+ byId.setStatus("宸插彂璐�");
+ 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 ;
+ }
+
+ @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());
+ }
+ boolean delete = this.removeBatchByIds(ids);
+ return delete;
+ }
}
--
Gitblit v1.9.3