From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java
index 53d28ae..bfed098 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoDetailServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.procurementrecord.service.impl.ReturnManagementServiceImpl;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.pojo.ShippingInfoDetail;
@@ -48,11 +49,16 @@
@Autowired
private CommonFileServiceImpl commonFileService;
+ @Autowired
+ private ReturnManagementServiceImpl returnManagementService;
+
@Override
public IPage<ShippingInfoDetail> listPage(Page page, ShippingInfoDetail shippingInfoDetail) {
IPage<ShippingInfoDetail> shippingInfoDetailIPage = shippingInfoDetailMapper.listPage(page, shippingInfoDetail);
shippingInfoDetailIPage.getRecords().forEach(item ->{
item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
+ BigDecimal returnSaleProductCountByShippingId = returnManagementService.getReturnSaleProductCountByShippingId(Collections.singletonList(item.getId()));
+ item.setReturnTotal(returnSaleProductCountByShippingId);
});
return shippingInfoDetailIPage;
}
@@ -76,6 +82,9 @@
}else{
shippingInfo.setStatus("鍙戣揣涓�");
}
+ // 鎵ｅ簱瀛�
+ shippingInfo.setShippingTotal(shippingInfoDetail.getShippingNum());
+ shippingInfo.setStockLocation(shippingInfoDetail.getStockLocation());
shippingInfoService.deductStock(shippingInfo);
// 杩佺Щ鏂囦欢
if(CollectionUtils.isNotEmpty(shippingInfoDetail.getTempFileIds())){
--
Gitblit v1.9.3