From bee57301e2868fb64c998504794d17bb26bd71d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 17 三月 2026 16:58:18 +0800
Subject: [PATCH] yys 1.需要加上库位，库位暂时分为外购、自制、委外三种类型 2.生产订单加上库存数量，方便实时查看 3.发货订单增加撤销功能
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 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 c33bb62..d0587a9 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -9,7 +9,12 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
+import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
+import com.ruoyi.procurementrecord.pojo.ReturnManagement;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoDetailMapper;
@@ -26,10 +31,7 @@
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.*;
import java.util.stream.Collectors;
/**
@@ -59,6 +61,58 @@
@Autowired
private ShippingInfoDetailService shippingInfoDetailService;
+ @Autowired
+ private ReturnManagementMapper returnManagementMapper;
+
+ @Autowired
+ private ReturnSaleProductMapper returnSaleProductMapper;
+
+ @Override
+ public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
+ return shippingInfoMapper.getReturnManagementDtoById(shippingId );
+
+ }
+
+ /**
+ * 鑾峰彇閿�鍞骇鍝佸崟鐨勫凡鍙戣揣鏁伴噺
+ * @param id
+ * @return
+ */
+ @Override
+ public Map<String, BigDecimal> getNumberOfSalesLedgerProduct(Long salesLedgerProductId) {
+ Map<String, BigDecimal> map = new HashMap<>();
+ map.put("shippingNum",BigDecimal.ZERO); // 鍙戣揣鏁伴噺
+ map.put("returnNum",BigDecimal.ZERO); // 閫�璐ф暟閲�
+ List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerProductId, salesLedgerProductId)
+ // 鍙瓫閫夆�滃彂璐т腑鈥濆拰鈥滃凡鍙戣揣鈥濅袱绉嶇姸鎬�
+ .in(ShippingInfo::getStatus, "鍙戣揣涓�", "宸插彂璐�"));
+ if(CollectionUtils.isEmpty(shippingInfos)){
+ return map;
+ }
+ List<ShippingInfoDetail> shippingInfoDetails = shippingInfoDetailMapper.selectList(new LambdaQueryWrapper<ShippingInfoDetail>()
+ .in(ShippingInfoDetail::getShippingInfoId, shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList())));
+ if(CollectionUtils.isEmpty(shippingInfoDetails)){
+ return map;
+ }
+ // 鑾峰彇鍙戣揣鏁伴噺
+ map.put("shippingNum",shippingInfoDetails.stream().map(ShippingInfoDetail::getShippingNum).reduce(BigDecimal.ZERO, BigDecimal::add));
+ // 鑾峰彇閫�璐ф暟閲�
+ List<ReturnSaleProduct> returnSaleProducts = returnSaleProductMapper.selectList(new LambdaQueryWrapper<ReturnSaleProduct>()
+ .eq(ReturnSaleProduct::getReturnSaleLedgerProductId, salesLedgerProductId)
+ .eq(ReturnSaleProduct::getStatus,1));
+ if(CollectionUtils.isEmpty(returnSaleProducts)){
+ return map;
+ }
+ map.put("returnNum",returnSaleProducts.stream().map(ReturnSaleProduct::getNum).reduce(BigDecimal.ZERO, BigDecimal::add));
+ return map;
+ }
+
+ @Override
+ public List<ShippingInfo> getShippingInfoByCustomerName(String customerName) {
+ return shippingInfoMapper.getShippingInfoByCustomerName(customerName);
+ }
+
@Override
public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
--
Gitblit v1.9.3