product-inventory-management-after.git

			@@ -25,6 +25,7 @@
			import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
			import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
			import com.ruoyi.technology.pojo.TechnologyRouting;
			import org.apache.commons.lang3.BooleanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -33,7 +34,6 @@
			import java.lang.reflect.Field;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.Arrays;
			@@ -97,16 +97,29 @@
			List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectSalesLedgerProductList(salesLedgerProduct);
			if(!CollectionUtils.isEmpty(salesLedgerProducts)){
			salesLedgerProducts.forEach(item -> {
			// 发货信息
			ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
			// 发货信息（取最新一条，只查询审核通过或已发货的记录）
			ShippingInfo latestShippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerProductId, item.getId())
			.in(ShippingInfo::getStatus, "审核通过", "已发货")
			.orderByDesc(ShippingInfo::getCreateTime)
			.last("limit 1"));
			if(shippingInfo != null){
			item.setShippingDate(shippingInfo.getShippingDate());
			item.setShippingCarNumber(shippingInfo.getShippingCarNumber());
			item.setExpressCompany(shippingInfo.getExpressCompany());
			item.setExpressNumber(shippingInfo.getExpressNumber());
			if(latestShippingInfo != null){
			item.setShippingDate(latestShippingInfo.getShippingDate());
			item.setExpressCompany(latestShippingInfo.getExpressCompany());
			item.setExpressNumber(latestShippingInfo.getExpressNumber());
			}
			// 车牌号：取所有审核通过或已发货记录的车牌号，逗号拼接
			List<ShippingInfo> allShippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerProductId, item.getId())
			.in(ShippingInfo::getStatus, "审核通过", "已发货")
			.orderByAsc(ShippingInfo::getCreateTime));
			if(!CollectionUtils.isEmpty(allShippingInfos)){
			String carNumbers = allShippingInfos.stream()
			.map(ShippingInfo::getShippingCarNumber)
			.filter(carNo -> carNo != null && !carNo.trim().isEmpty())
			.distinct()
			.collect(Collectors.joining(","));
			item.setShippingCarNumber(carNumbers);
			}
			});
			}
			@@ -215,14 +228,15 @@
			*/
			public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
			//先判断该产品是否需要生产
			if (!salesLedgerProduct.getIsProduction()) {
			if (!BooleanUtils.isTrue(salesLedgerProduct.getIsProduction())) {
			return;
			}
			SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());
			ProductionPlan productionPlan = new ProductionPlan();
			productionPlan.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
			productionPlan.setSalesLedgerProductId(salesLedgerProduct.getId());
			productionPlan.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
			productionPlan.setMpsNo(generateNextPlanNo(com.ruoyi.common.utils.DateUtils.toLocalDate(salesLedger.getEntryDate())
			.format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
			productionPlan.setProductModelId(salesLedgerProduct.getProductModelId());
			productionPlan.setQtyRequired(salesLedgerProduct.getQuantity());
			productionPlan.setSource("销售");