Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂

zss

16 小时以前 4f39e676277d7a66e13d172288032ce16bb18e8c

Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -349,4 +349,32 @@
        return AjaxResult.success();
    }

    @PostMapping("/salesHistory/shippingImport")
    @ApiOperation("销售发货历史数据导入-已发货")
    public AjaxResult shippingImport(MultipartFile file) {
        salesLedgerService.shippingImport(file);
        return AjaxResult.success();
    }

    @PostMapping("/salesHistory/notShippingImport")
    @ApiOperation("销售发货历史数据导入-未发货")
    public AjaxResult notShippingImport(MultipartFile file) {
        salesLedgerService.notShippingImport(file);
        return AjaxResult.success();
    }

    @PostMapping("/salesHistory/shippingImportTemplate")
    @ApiOperation("销售发货历史数据导入-已发货导入模板下载")
    public void shippingImportTemplate(HttpServletResponse response) {
        ExcelUtil<SalesShippingImportDto> excelUtil = new ExcelUtil<>(SalesShippingImportDto.class);
        excelUtil.importTemplateExcel(response, "已发货导入模板下载");
    }

    @PostMapping("/salesHistory/notShippingImportTemplate")
    @ApiOperation("销售发货历史数据导入-未发货导入模板下载")
    public void notShippingImportTemplate(HttpServletResponse response) {
        ExcelUtil<SalesNotShippingImportDto> excelUtil = new ExcelUtil<>(SalesNotShippingImportDto.class);
        excelUtil.importTemplateExcel(response, "未发货导入模板下载");
    }

}

 src/main/java/com/ruoyi/sales/dto/SalesNotShippingImportDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package com.ruoyi.sales.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * <br>
 * é”€å”®å‘货历史数据导入-未发货
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/4/22 11:47
 */
@Data
public class SalesNotShippingImportDto {

    // --- åŸºæœ¬ä¿¡æ¯ ---
    @Excel(name = "自序")
    private Long sequence;

    @Excel(name = "分厂")
    private String branchFactory;

    @Excel(name = "订单类型")
    private String orderType;

    @Excel(name = "报表日期", width = 30, dateFormat = "yyyy/MM/dd HH:mm:ss")
    private Date reportDate;

    @Excel(name = "订单编号")
    private String orderNo;

    @Excel(name = "合同编号")
    private String contractNo;

    @Excel(name = "对方单号")
    private String customerOrderNo;

    @Excel(name = "订单序号")
    private String orderSortNo;

    @Excel(name = "楼层编号")
    private String floorNo;

    // --- äº§å“ä¿¡æ¯ ---
    @Excel(name = "产品名称")
    private String productName;

    @Excel(name = "客户编号")
    private String customerCode;

    @Excel(name = "客户名称")
    private String customerName;

    @Excel(name = "工程编号")
    private String projectNo;

    @Excel(name = "项目名称")
    private String projectName;

    @Excel(name = "结算币种")
    private String currency;

    @Excel(name = "业务员")
    private String salesman;

    @Excel(name = "交货期限", width = 30, dateFormat = "yyyy/MM/dd HH:mm:ss")
    private Date deliveryDeadline;

    // --- è§„格与数量 ---
    @Excel(name = "宽")
    private BigDecimal width;

    @Excel(name = "高")
    private BigDecimal height;

    @Excel(name = "数量")
    private BigDecimal quantity;

    @Excel(name = "实际单片面积")
    private BigDecimal actualSingleArea;

    @Excel(name = "实际面积")
    private BigDecimal actualTotalArea;

    @Excel(name = "结算单片面积")
    private BigDecimal settlementSingleArea;

    @Excel(name = "结算面积")
    private BigDecimal settlementTotalArea;

    // --- é‡‘额与费用 ---
    @Excel(name = "单价")
    private BigDecimal unitPrice;

    @Excel(name = "玻璃金额")
    private BigDecimal glassAmount;

    @Excel(name = "其它加工费")
    private BigDecimal otherProcessFee;

    // --- å·¥è‰ºå‚æ•° ---
    @Excel(name = "周长")
    private BigDecimal perimeter;

    @Excel(name = "磨边长度")
    private BigDecimal grindingLength;

    @Excel(name = "磨边等级")
    private String grindingLevel;

    @Excel(name = "加工要求")
    private String processRequirement;

    @Excel(name = "图号")
    private String drawingNo;

    @Excel(name = "示意图号")
    private String sketchNo;

    @Excel(name = "模板图号")
    private String templateNo;

    @Excel(name = "R")
    private String radiusR;

    @Excel(name = "形状")
    private String shape;

    @Excel(name = "异形参数")
    private String irregularParam;

    @Excel(name = "胶深")
    private String glueDepth;

    // --- ç‰©æµä¸Žæµç¨‹ ---
    @Excel(name = "送货地址")
    private String deliveryAddress;

    @Excel(name = "制单员")
    private String creator;

    @Excel(name = "审核人")
    private String auditor;

    @Excel(name = "产品大类")
    private String productCategory;

    @Excel(name = "产品子类")
    private String productSubCategory;

    @Excel(name = "付款条件")
    private String paymentTerms;

    @Excel(name = "付款方式")
    private String paymentMethod;

    @Excel(name = "备注")
    private String remark;

    @Excel(name = "玻璃厚度")
    private BigDecimal glassThickness;

    @Excel(name = "总厚度")
    private BigDecimal totalThickness;

    @Excel(name = "重箱")
    private BigDecimal heavyBox;

    @Excel(name = "订单工艺流程")
    private String processFlow;

    @Excel(name = "审核后备注")
    private String auditRemark;

    @Excel(name = "打孔")
    private BigDecimal drilling;

    @Excel(name = "挖缺")
    private BigDecimal notching;

    @Excel(name = "安全角")
    private BigDecimal safetyCorner;

    @Excel(name = "磨边(异形)")
    private BigDecimal grindingIrregular;
}

 src/main/java/com/ruoyi/sales/dto/SalesShippingImportDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,165 @@
package com.ruoyi.sales.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * é”€å”®å‘货历史数据导入-已发货
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/4/22 11:47
 */
@Data
public class SalesShippingImportDto {

    @Excel(name = "自序")
    private Long sequence;

    @Excel(name = "分厂")
    private String branchFactory;

    @Excel(name = "价格审核")
    private String priceAudit;

    @Excel(name = "订单类型")
    private String orderType;

    @Excel(name = "报表日期", width = 30, dateFormat = "yyyy/MM/dd HH:mm:ss")
    private Date reportDate;

    @Excel(name = "发货编号")
    private String shippingNo;

    @Excel(name = "客户编号")
    private String customerCode;

    @Excel(name = "客户名称")
    private String customerName;

    @Excel(name = "工程编号")
    private String projectNo;

    @Excel(name = "项目名称")
    private String projectName;

    @Excel(name = "结算币种")
    private String currency;

    @Excel(name = "付款条件")
    private String paymentTerms;

    @Excel(name = "业务员")
    private String salesman;

    @Excel(name = "车号")
    private String carNo;

    @Excel(name = "订单编号")
    private String orderNo;

    @Excel(name = "合同编号")
    private String contractNo;

    @Excel(name = "对方单号")
    private String customerOrderNo;

    @Excel(name = "产品大类")
    private String productCategory;

    @Excel(name = "产品子类")
    private String productSubCategory;

    @Excel(name = "产品名称")
    private String productName;

    @Excel(name = "数量")
    private BigDecimal quantity;

    @Excel(name = "单价")
    private BigDecimal unitPrice;

    @Excel(name = "实际面积")
    private BigDecimal actualArea;

    @Excel(name = "结算面积")
    private BigDecimal settlementArea;

    @Excel(name = "玻璃金额")
    private BigDecimal glassAmount;

    @Excel(name = "其他加工费")
    private BigDecimal otherProcessFee;

    @Excel(name = "金额")
    private BigDecimal totalAmount;

    @Excel(name = "重箱")
    private String heavyBox;

    @Excel(name = "重量")
    private BigDecimal weight;

    @Excel(name = "单据加工要求")
    private String orderProcessRequirement;

    @Excel(name = "单据备注")
    private String orderRemark;

    @Excel(name = "审核后备注")
    private String auditRemark;

    @Excel(name = "送货地址")
    private String deliveryAddress;

    @Excel(name = "制单员")
    private String creator;

    @Excel(name = "玻璃厚度")
    private String glassThickness;

    @Excel(name = "成品厚度")
    private String productThickness;

    @Excel(name = "mm平方")
    private BigDecimal mmSquare;

    @Excel(name = "产品简称")
    private String productShortName;

    @Excel(name = "运输方式")
    private String transportType;

    @Excel(name = "价格审核人")
    private String priceAuditor;

    @Excel(name = "价格审核日期", width = 30, dateFormat = "yyyy/MM/dd")
    private Date priceAuditDate;

    @Excel(name = "联系人")
    private String contactPerson;

    @Excel(name = "联系电话")
    private String contactPhone;

    @Excel(name = "一级地区")
    private String regionLevel1;

    @Excel(name = "二级地区")
    private String regionLevel2;

    @Excel(name = "打孔")
    private Integer holeCount;

    @Excel(name = "挖缺")
    private Integer notchCount;

    @Excel(name = "安全角")
    private Integer safetyCornerCount;

    @Excel(name = "磨边(异形)")
    private String irregularGrinding;
}

 src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java

@@ -84,4 +84,8 @@
    void scanOutbound(SalesScanInboundDto dto);

    void scanOutboundUnqualified(SalesScanInboundDto dto);

    void shippingImport(MultipartFile file);

    void notShippingImport(MultipartFile file);
}

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -18,6 +18,7 @@
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.CustomerRegions;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.ICustomerRegionsService;
import com.ruoyi.common.enums.FileNameType;
@@ -87,6 +88,7 @@
import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -228,11 +230,7 @@
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
        Map<Long, ProductModel> productModelMap = Collections.emptyMap();
        if (CollectionUtils.isNotEmpty(products)) {
            List<Long> productModelIds = products.stream()
                    .map(SalesLedgerProduct::getProductModelId)
                    .filter(Objects::nonNull)
                    .distinct()
                    .collect(Collectors.toList());
            List<Long> productModelIds = products.stream().map(SalesLedgerProduct::getProductModelId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
            if (CollectionUtils.isNotEmpty(productModelIds)) {
                List<ProductModel> productModels = productModelMapper.selectBatchIds(productModelIds);
                if (CollectionUtils.isNotEmpty(productModels)) {
@@ -248,26 +246,15 @@
            product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
            product.setRegisterDate(LocalDateTime.now());
            // å‘货信息
            ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
                    .orderByDesc(ShippingInfo::getCreateTime)
                    .last("limit 1"));
            ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerProductId, product.getId()).orderByDesc(ShippingInfo::getCreateTime).last("limit 1"));
            if (shippingInfo != null) {
                product.setShippingStatus(shippingInfo.getStatus());
            }
            // åŠ å·¥æ˜Žç»†ï¼Œå…ˆæŸ¥bind表获取该产品关联的工序及数量
            List<SalesLedgerProductProcessBind> bindList = salesLedgerProductProcessBindService.list(
                    new LambdaQueryWrapper<SalesLedgerProductProcessBind>()
                            .eq(SalesLedgerProductProcessBind::getSalesLedgerProductId, product.getId()));
            List<SalesLedgerProductProcessBind> bindList = salesLedgerProductProcessBindService.list(new LambdaQueryWrapper<SalesLedgerProductProcessBind>().eq(SalesLedgerProductProcessBind::getSalesLedgerProductId, product.getId()));
            if (!bindList.isEmpty()) {
                List<Integer> processIds = bindList.stream()
                        .map(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId)
                        .collect(Collectors.toList());
                Map<Integer, Integer> processQuantityMap = bindList.stream()
                        .collect(Collectors.toMap(
                                SalesLedgerProductProcessBind::getSalesLedgerProductProcessId,
                                SalesLedgerProductProcessBind::getQuantity,
                                (a, b) -> a));
                List<Integer> processIds = bindList.stream().map(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId).collect(Collectors.toList());
                Map<Integer, Integer> processQuantityMap = bindList.stream().collect(Collectors.toMap(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId, SalesLedgerProductProcessBind::getQuantity, (a, b) -> a));
                List<SalesLedgerProductProcess> processList = salesLedgerProductProcessService.listByIds(processIds);
                processList.forEach(p -> p.setQuantity(processQuantityMap.get(p.getId())));
                product.setSalesProductProcessList(processList);
@@ -291,8 +278,7 @@

        // 3.查询上传文件
        LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
        salesLedgerFileWrapper.eq(CommonFile::getCommonId, salesLedger.getId())
                .eq(CommonFile::getType, FileNameType.SALE.getValue());
        salesLedgerFileWrapper.eq(CommonFile::getCommonId, salesLedger.getId()).eq(CommonFile::getType, FileNameType.SALE.getValue());
        List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper);

        // 4. è½¬æ¢ DTO
@@ -315,11 +301,7 @@
        List<Map<String, Object>> result = salesLedgerMapper.selectMaps(queryWrapper);

        // å°†ä¸‹åˆ’线命名转换为驼峰命名
        return result.stream().map(map -> map.entrySet().stream()
                .collect(Collectors.toMap(
                        entry -> underlineToCamel(entry.getKey()),
                        Map.Entry::getValue))
        ).collect(Collectors.toList());
        return result.stream().map(map -> map.entrySet().stream().collect(Collectors.toMap(entry -> underlineToCamel(entry.getKey()), Map.Entry::getValue))).collect(Collectors.toList());
    }

    @Override
@@ -335,10 +317,7 @@
        // æ‰§è¡ŒæŸ¥è¯¢å¹¶è®¡ç®—总和
        List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(queryWrapper);

        BigDecimal totalContractAmount = salesLedgers.stream()
                .map(SalesLedger::getContractAmount)
                .filter(Objects::nonNull)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
        BigDecimal totalContractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

        return totalContractAmount;
    }
@@ -347,32 +326,23 @@
    public List getTopFiveList() {
        // æŸ¥è¯¢åŽŸå§‹æ•°æ®
        LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.lambdaQuery();
        queryWrapper.select(SalesLedger::getCustomerId,
                        SalesLedger::getCustomerName,
                        SalesLedger::getContractAmount)
                .orderByDesc(SalesLedger::getContractAmount);
        queryWrapper.select(SalesLedger::getCustomerId, SalesLedger::getCustomerName, SalesLedger::getContractAmount).orderByDesc(SalesLedger::getContractAmount);
        List<SalesLedger> records = salesLedgerMapper.selectList(queryWrapper);

        // æŒ‰å®¢æˆ·ID分组并聚合金额
        Map<Long, GroupedCustomer> groupedMap = new LinkedHashMap<>(); // ä½¿ç”¨LinkedHashMap保持排序
        for (SalesLedger record : records) {
            groupedMap.computeIfAbsent(record.getCustomerId(),
                            k -> new GroupedCustomer(record.getCustomerId(), record.getCustomerName()))
                    .addAmount(record.getContractAmount());
            groupedMap.computeIfAbsent(record.getCustomerId(), k -> new GroupedCustomer(record.getCustomerId(), record.getCustomerName())).addAmount(record.getContractAmount());
        }

        // è½¬æ¢ä¸ºç»“果列表并取前5
        return groupedMap.values().stream()
                .sorted(Comparator.comparing(GroupedCustomer::getTotalAmount).reversed())
                .limit(5)
                .map(customer -> {
                    Map<String, Object> result = new HashMap<>();
                    result.put("customerId", customer.getCustomerId());
                    result.put("customerName", customer.getCustomerName());
                    result.put("totalAmount", customer.getTotalAmount());
                    return result;
                })
                .collect(Collectors.toList());
        return groupedMap.values().stream().sorted(Comparator.comparing(GroupedCustomer::getTotalAmount).reversed()).limit(5).map(customer -> {
            Map<String, Object> result = new HashMap<>();
            result.put("customerId", customer.getCustomerId());
            result.put("customerName", customer.getCustomerName());
            result.put("totalAmount", customer.getTotalAmount());
            return result;
        }).collect(Collectors.toList());
    }

    @Override
@@ -388,31 +358,19 @@

            //  å›žæ¬¾é‡‘额
            LambdaQueryWrapper<ReceiptPayment> receiptPaymentQuery = new LambdaQueryWrapper<>();
            receiptPaymentQuery
                    .ge(ReceiptPayment::getCreateTime, startTime)
                    .le(ReceiptPayment::getCreateTime, endTime);
            receiptPaymentQuery.ge(ReceiptPayment::getCreateTime, startTime).le(ReceiptPayment::getCreateTime, endTime);

            List<ReceiptPayment> receiptPayments =
                    receiptPaymentMapper.selectList(receiptPaymentQuery);
            List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(receiptPaymentQuery);

            BigDecimal receiptAmount = receiptPayments.stream()
                    .map(ReceiptPayment::getReceiptPaymentAmount)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal receiptAmount = receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

            //  å¼€ç¥¨é‡‘额
            LambdaQueryWrapper<InvoiceLedger> invoiceLedgerQuery = new LambdaQueryWrapper<>();
            invoiceLedgerQuery
                    .ge(InvoiceLedger::getCreateTime, startTime)
                    .le(InvoiceLedger::getCreateTime, endTime);
            invoiceLedgerQuery.ge(InvoiceLedger::getCreateTime, startTime).le(InvoiceLedger::getCreateTime, endTime);

            List<InvoiceLedger> invoiceLedgers =
                    invoiceLedgerMapper.selectList(invoiceLedgerQuery);
            List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(invoiceLedgerQuery);

            BigDecimal invoiceAmount = invoiceLedgers.stream()
                    .map(InvoiceLedger::getInvoiceTotal)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal invoiceAmount = invoiceLedgers.stream().map(InvoiceLedger::getInvoiceTotal).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

            MonthlyAmountDto dto = new MonthlyAmountDto();
            dto.setMonth(yearMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")));
@@ -438,9 +396,7 @@
        boolean hasWidthHeightFilter = salesLedgerDto.getWidth() != null || salesLedgerDto.getHeight() != null;
        Map<Long, List<SalesLedgerProduct>> matchedProductsMap = Collections.emptyMap();
        if (hasWidthHeightFilter) {
            LambdaQueryWrapper<SalesLedgerProduct> productQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>()
                    .in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds)
                    .eq(SalesLedgerProduct::getType, 1);
            LambdaQueryWrapper<SalesLedgerProduct> productQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds).eq(SalesLedgerProduct::getType, 1);
            if (salesLedgerDto.getWidth() != null) {
                productQueryWrapper.eq(SalesLedgerProduct::getWidth, salesLedgerDto.getWidth());
            }
@@ -448,34 +404,22 @@
                productQueryWrapper.eq(SalesLedgerProduct::getHeight, salesLedgerDto.getHeight());
            }
            List<SalesLedgerProduct> matchedProducts = salesLedgerProductMapper.selectList(productQueryWrapper);
            matchedProductsMap = CollectionUtils.isEmpty(matchedProducts) ? Collections.emptyMap()
                    : matchedProducts.stream().collect(Collectors.groupingBy(SalesLedgerProduct::getSalesLedgerId));
            matchedProductsMap = CollectionUtils.isEmpty(matchedProducts) ? Collections.emptyMap() : matchedProducts.stream().collect(Collectors.groupingBy(SalesLedgerProduct::getSalesLedgerId));
        }

        List<SalesLedgerProductTotalsDto> productTotals = salesLedgerProductMapper.selectSalesLedgerProductTotals(salesLedgerIds, 1);
        Map<Long, SalesLedgerProductTotalsDto> productTotalsMap = CollectionUtils.isEmpty(productTotals)
                ? Collections.emptyMap()
                : productTotals.stream()
                .filter(t -> t.getSalesLedgerId() != null)
                .collect(Collectors.toMap(SalesLedgerProductTotalsDto::getSalesLedgerId, Function.identity(), (a, b) -> a));
        Map<Long, SalesLedgerProductTotalsDto> productTotalsMap = CollectionUtils.isEmpty(productTotals) ? Collections.emptyMap() : productTotals.stream().filter(t -> t.getSalesLedgerId() != null).collect(Collectors.toMap(SalesLedgerProductTotalsDto::getSalesLedgerId, Function.identity(), (a, b) -> a));

        List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
        if (CollectionUtils.isEmpty(invoiceLedgerDtoList)) {
            invoiceLedgerDtoList = Collections.emptyList();
        }

        Map<Long, BigDecimal> invoiceTotals = invoiceLedgerDtoList.stream()
                .filter(dto -> dto.getSalesLedgerId() != null && dto.getInvoiceTotal() != null)
                .collect(Collectors.toMap(
                        dto -> dto.getSalesLedgerId().longValue(),
                        InvoiceLedgerDto::getInvoiceTotal,
                        BigDecimal::add
                ));
        Map<Long, BigDecimal> invoiceTotals = invoiceLedgerDtoList.stream().filter(dto -> dto.getSalesLedgerId() != null && dto.getInvoiceTotal() != null).collect(Collectors.toMap(dto -> dto.getSalesLedgerId().longValue(), InvoiceLedgerDto::getInvoiceTotal, BigDecimal::add));

        List<ReceiptPayment> receiptPayments = Collections.emptyList();
        if (!CollectionUtils.isEmpty(salesLedgerIds)) {
            receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
                    .in(ReceiptPayment::getSalesLedgerId, salesLedgerIds));
            receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>().in(ReceiptPayment::getSalesLedgerId, salesLedgerIds));
        }

        Map<Long, BigDecimal> receiptTotals = new HashMap<>();
@@ -527,8 +471,7 @@
        }

        if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {
            iPage.getRecords().removeIf(salesLedger ->
                    Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
            iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
            iPage.setTotal(iPage.getRecords().size());
        }

@@ -565,16 +508,12 @@
            throw new ServiceException("导入失败,销售产品数据为空");
        }
        // å®¢æˆ·æ•°æ®
        List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName,
                salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
        List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>().in(Customer::getCustomerName, salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getCustomerName).collect(Collectors.toList())));
        List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
        // å½•å…¥äººæ•°æ®
        List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
                salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
        List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName, salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
        for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
            SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                    .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
                    .last("LIMIT 1"));
            SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo()).last("LIMIT 1"));
            if (salesLedger1 != null) {
                throw new ServiceException("导入失败：合同号 [" + salesLedgerImportDto.getSalesContractNo() + "] å·²å­˜åœ¨ï¼Œè¯·æ£€æŸ¥åŽé‡æ–°å¯¼å…¥");
            }
@@ -590,35 +529,19 @@
            salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));

            LocalDate expectedDeliveryDate = DateUtils.toLocalDate(salesLedgerImportDto.getEntryDate()).plusDays(7);
            LocalDate importDeliveryDate = salesLedgerImportDto.getDeliveryDate() == null
                    ? null
                    : DateUtils.toLocalDate(salesLedgerImportDto.getDeliveryDate());
            LocalDate importDeliveryDate = salesLedgerImportDto.getDeliveryDate() == null ? null : DateUtils.toLocalDate(salesLedgerImportDto.getDeliveryDate());
            // äº¤ä»˜æ—¥æœŸä¸ºç©ºåˆ™é»˜è®¤å–录入日期后7天
            salesLedger.setDeliveryDate(importDeliveryDate == null ? expectedDeliveryDate : importDeliveryDate);
            // é€šè¿‡å®¢æˆ·åç§°æŸ¥è¯¢å®¢æˆ·ID，客户合同号
            salesLedger.setCustomerId(customers.stream()
                    .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
                    .findFirst()
                    .map(Customer::getId)
                    .orElse(null));
            salesLedger.setCustomerContractNo(customers.stream()
                    .filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName()))
                    .findFirst()
                    .map(Customer::getTaxpayerIdentificationNumber)
                    .orElse(null));
            Long aLong = sysUsers.stream()
                    .filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson()))
                    .findFirst()
                    .map(SysUser::getUserId)
                    .orElse(null);
            salesLedger.setCustomerId(customers.stream().filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName())).findFirst().map(Customer::getId).orElse(null));
            salesLedger.setCustomerContractNo(customers.stream().filter(customer -> customer.getCustomerName().equals(salesLedger.getCustomerName())).findFirst().map(Customer::getTaxpayerIdentificationNumber).orElse(null));
            Long aLong = sysUsers.stream().filter(sysUser -> sysUser.getNickName().equals(salesLedger.getEntryPerson())).findFirst().map(SysUser::getUserId).orElse(null);
            if (aLong == null) {
                throw new ServiceException("录入人:" + salesLedger.getEntryPerson() + ",无对应用户！");
            }
            salesLedger.setEntryPerson(aLong.toString());
            // é”€å”®äº§å“æ•°æ®ç»‘定，通过销售单号获取对应销售产品数据
            List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
                    .filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo()))
                    .collect(Collectors.toList());
            List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream().filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo())).collect(Collectors.toList());
            if (CollectionUtils.isEmpty(salesLedgerProductImportDtos)) {
                throw new ServiceException("销售单号:" + salesLedgerImportDto.getSalesContractNo() + ",无对应产品数据！");
            }
@@ -659,30 +582,21 @@
                salesLedgerProduct.setActualPieceArea(actualPieceArea);
                salesLedgerProduct.setActualTotalArea(actualPieceArea.multiply(quantity).setScale(4, RoundingMode.HALF_UP));

                BigDecimal settlePieceArea = salesLedgerProduct.getSettlePieceArea() == null
                        ? actualPieceArea
                        : salesLedgerProduct.getSettlePieceArea();
                BigDecimal settlePieceArea = salesLedgerProduct.getSettlePieceArea() == null ? actualPieceArea : salesLedgerProduct.getSettlePieceArea();
                salesLedgerProduct.setSettlePieceArea(settlePieceArea);
                salesLedgerProduct.setSettleTotalArea(settlePieceArea.multiply(quantity).setScale(4, RoundingMode.HALF_UP));

                BigDecimal perimeter = BigDecimal.ZERO;
                if (width.compareTo(BigDecimal.ZERO) > 0 && height.compareTo(BigDecimal.ZERO) > 0) {
                    perimeter = width.add(height)
                            .multiply(new BigDecimal("2"))
                            .divide(new BigDecimal("10"), 2, RoundingMode.HALF_UP);
                    perimeter = width.add(height).multiply(new BigDecimal("2")).divide(new BigDecimal("10"), 2, RoundingMode.HALF_UP);
                }
                salesLedgerProduct.setPerimeter(perimeter);

                BigDecimal extraProcessAmountPerPiece = BigDecimal.ZERO;
                list.stream()
                        .filter(Objects::nonNull)
                        .filter(map -> Objects.equals(Objects.toString(map.get("productName"), null), salesLedgerProduct.getProductCategory())
                                && Objects.equals(Objects.toString(map.get("model"), null), salesLedgerProduct.getSpecificationModel()))
                        .findFirst()
                        .ifPresent(map -> {
                            salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
                            salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
                        });
                list.stream().filter(Objects::nonNull).filter(map -> Objects.equals(Objects.toString(map.get("productName"), null), salesLedgerProduct.getProductCategory()) && Objects.equals(Objects.toString(map.get("model"), null), salesLedgerProduct.getSpecificationModel())).findFirst().ifPresent(map -> {
                    salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
                    salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
                });
                salesLedgerProduct.setRegister(loginUser.getNickName());
                salesLedgerProduct.setRegisterDate(LocalDateTime.now());
                salesLedgerProduct.setApproveStatus(0);
@@ -702,19 +616,13 @@
                                String qtyStr = parts[1].trim();
                                try {
                                    BigDecimal processQty = new BigDecimal(qtyStr);
                                    SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(
                                            new LambdaQueryWrapper<SalesLedgerProductProcess>()
                                                    .eq(SalesLedgerProductProcess::getProcessName, processName)
                                                    .last("LIMIT 1")
                                    );
                                    SalesLedgerProductProcess process = salesLedgerProductProcessService.getOne(new LambdaQueryWrapper<SalesLedgerProductProcess>().eq(SalesLedgerProductProcess::getProcessName, processName).last("LIMIT 1"));
                                    if (process != null) {
                                        SalesLedgerProductProcess p = new SalesLedgerProductProcess();
                                        p.setId(process.getId());
                                        p.setQuantity(processQty.intValue());
                                        processList.add(p);
                                        extraProcessAmountPerPiece = extraProcessAmountPerPiece.add(
                                                defaultDecimal(process.getUnitPrice()).multiply(processQty)
                                        );
                                        extraProcessAmountPerPiece = extraProcessAmountPerPiece.add(defaultDecimal(process.getUnitPrice()).multiply(processQty));
                                    }
                                } catch (Exception e) {
                                    log.error("解析额外加工数量失败: {}", qtyStr);
@@ -725,18 +633,13 @@
                }

                // å«ç¨Žæ€»ä»· = å•ä»· * ç»“算面积 * æ•°é‡ + é¢å¤–加工金额 * æ•°é‡
                BigDecimal taxInclusiveTotalPrice = unitPrice.multiply(settlePieceArea)
                        .multiply(quantity)
                        .add(extraProcessAmountPerPiece.multiply(quantity))
                        .setScale(2, RoundingMode.HALF_UP);
                BigDecimal taxInclusiveTotalPrice = unitPrice.multiply(settlePieceArea).multiply(quantity).add(extraProcessAmountPerPiece.multiply(quantity)).setScale(2, RoundingMode.HALF_UP);
                salesLedgerProduct.setTaxInclusiveTotalPrice(taxInclusiveTotalPrice);
                assertPositive(taxInclusiveTotalPrice, "含税总价", locate);

                // ç¨ŽçŽ‡å…è®¸ä¸ºç©ºï¼Œç©ºå€¼æŒ‰0处理
                BigDecimal taxDivisor = BigDecimal.ONE.add(taxRate.divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP));
                salesLedgerProduct.setTaxExclusiveTotalPrice(
                        taxInclusiveTotalPrice.divide(taxDivisor, 2, RoundingMode.HALF_UP)
                );
                salesLedgerProduct.setTaxExclusiveTotalPrice(taxInclusiveTotalPrice.divide(taxDivisor, 2, RoundingMode.HALF_UP));
                salesLedgerProduct.setNoInvoiceNum(quantity);
                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
                salesLedgerProduct.setPendingInvoiceTotal(taxInclusiveTotalPrice);
@@ -809,10 +712,7 @@
                product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
                product.setRegisterDate(LocalDateTime.now());
                // å‘货信息
                ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
                        .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
                        .orderByDesc(ShippingInfo::getCreateTime)
                        .last("limit 1"));
                ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerProductId, product.getId()).orderByDesc(ShippingInfo::getCreateTime).last("limit 1"));
                product.setShippingCarNumber(shippingInfo.getShippingCarNumber());
                product.setShippingDate(shippingInfo.getShippingDate());
                if (shippingInfo != null) {
@@ -889,21 +789,16 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public int deleteSalesLedgerByIds(Long[] ids) {
        List<Long> idList = Arrays.stream(ids)
                .filter(Objects::nonNull)
                .collect(Collectors.toList());
        List<Long> idList = Arrays.stream(ids).filter(Objects::nonNull).collect(Collectors.toList());
        if (CollectionUtils.isEmpty(idList)) {
            return 0;
        }
        // åˆ é™¤é”€å”®ç®¡ç†æ•°æ®
        LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList)
                .select(SalesLedgerProduct::getId);
        queryWrapper.in(SalesLedgerProduct::getSalesLedgerId, idList).select(SalesLedgerProduct::getId);

        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(queryWrapper);
        List<Long> productIds = products.stream()
                .map(SalesLedgerProduct::getId)
                .collect(Collectors.toList());
        List<Long> productIds = products.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
        //删除生产数据
        salesLedgerProductServiceImpl.deleteProductionData(productIds);

@@ -939,27 +834,16 @@
            receiptPaymentMapper.delete(wrapperTree);
        }
        // åˆ é™¤å‘货台账记录
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
                .in(ShippingInfo::getSalesLedgerId, idList));
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>().in(ShippingInfo::getSalesLedgerId, idList));
        if (CollectionUtils.isNotEmpty(shippingInfos)) {
            shippingInfoServiceImpl.delete(shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList()));
        }
        // åˆ é™¤å…³è”的入库/出库记录（走服务层删除，触发库存数量回退）
        List<Long> stockInRecordIds = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                        .in(StockInRecord::getSalesLedgerId, idList)
                        .select(StockInRecord::getId))
                .stream()
                .map(StockInRecord::getId)
                .collect(Collectors.toList());
        List<Long> stockInRecordIds = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>().in(StockInRecord::getSalesLedgerId, idList).select(StockInRecord::getId)).stream().map(StockInRecord::getId).collect(Collectors.toList());
        if (CollectionUtils.isNotEmpty(stockInRecordIds)) {
            stockInRecordService.batchDelete(stockInRecordIds);
        }
        List<Long> stockOutRecordIds = stockOutRecordMapper.selectList(new LambdaQueryWrapper<StockOutRecord>()
                        .in(StockOutRecord::getSalesLedgerId, idList)
                        .select(StockOutRecord::getId))
                .stream()
                .map(StockOutRecord::getId)
                .collect(Collectors.toList());
        List<Long> stockOutRecordIds = stockOutRecordMapper.selectList(new LambdaQueryWrapper<StockOutRecord>().in(StockOutRecord::getSalesLedgerId, idList).select(StockOutRecord::getId)).stream().map(StockOutRecord::getId).collect(Collectors.toList());
        if (CollectionUtils.isNotEmpty(stockOutRecordIds)) {
            stockOutRecordService.batchDelete(stockOutRecordIds);
        }
@@ -1010,13 +894,7 @@
            List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();
            if (productList != null && !productList.isEmpty()) {
                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));
                updateMainContractAmount(
                        salesLedger.getId(),
                        productList,
                        SalesLedgerProduct::getTaxInclusiveTotalPrice,
                        salesLedgerMapper,
                        SalesLedger.class
                );
                updateMainContractAmount(salesLedger.getId(), productList, SalesLedgerProduct::getTaxInclusiveTotalPrice, salesLedgerMapper, SalesLedger.class);
            }

            // 5. è¿ç§»ä¸´æ—¶æ–‡ä»¶åˆ°æ­£å¼ç›®å½•
@@ -1062,10 +940,7 @@
            // æž„建正式文件名（包含业务ID和时间戳，避免冲突）
            String originalFilename = tempFile.getOriginalName();
            String fileExtension = FilenameUtils.getExtension(originalFilename);
            String formalFilename = businessId + "_" +
                    System.currentTimeMillis() + "_" +
                    UUID.randomUUID().toString().substring(0, 8) +
                    (StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
            String formalFilename = businessId + "_" + System.currentTimeMillis() + "_" + UUID.randomUUID().toString().substring(0, 8) + (StringUtils.hasText(fileExtension) ? "." + fileExtension : "");

            Path formalFilePath = formalDirPath.resolve(formalFilename);

@@ -1109,9 +984,7 @@
    @Override
    public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {
        // æŒ‰ID分组，区分新增和更新的记录
        Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()
                .peek(p -> p.setSalesLedgerId(salesLedgerId))
                .collect(Collectors.partitioningBy(p -> p.getId() != null));
        Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream().peek(p -> p.setSalesLedgerId(salesLedgerId)).collect(Collectors.partitioningBy(p -> p.getId() != null));

        List<SalesLedgerProduct> updateList = partitionedProducts.get(true);
        List<SalesLedgerProduct> insertList = partitionedProducts.get(false);
@@ -1178,10 +1051,7 @@
        if (salesLedgerId == null) return;
        SalesLedger ledger = baseMapper.selectById(salesLedgerId);
        if (ledger == null) return;
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(
                Wrappers.<SalesLedgerProduct>lambdaQuery()
                        .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
                        .eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
        if (CollectionUtils.isEmpty(allProducts)) {
            ledger.setStockStatus(0);
            baseMapper.updateById(ledger);
@@ -1248,11 +1118,7 @@
        } finally {
            // 3. é‡Šæ”¾é”
            String luaScript = "if redis.call('GET', KEYS[1]) == ARGV[1] then return redis.call('DEL', KEYS[1]) else return 0 end";
            redisTemplate.execute(
                    new DefaultRedisScript<>(luaScript, Long.class),
                    Collections.singletonList(lockKey),
                    lockValue
            );
            redisTemplate.execute(new DefaultRedisScript<>(luaScript, Long.class), Collections.singletonList(lockKey), lockValue);
        }
    }

@@ -1309,8 +1175,7 @@
        dto.setOrderProcessRequirement(salesLedger.getRemarks());

        //  æŸ¥è¯¢äº§å“åˆ—表
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
                new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));

        BigDecimal totalQuantity = BigDecimal.ZERO;
        BigDecimal totalArea = BigDecimal.ZERO;
@@ -1320,8 +1185,7 @@
            SalesProcessCardDto.ProcessCardItemDto itemDto = new SalesProcessCardDto.ProcessCardItemDto();
            itemDto.setFloorCode(p.getFloorCode());
            // ç»„装产品描述：大类 + (规格)
            String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") +
                    (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
            String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") + (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
            itemDto.setProductDescription(desc.trim());
            itemDto.setWidth(p.getWidth());
            itemDto.setHeight(p.getHeight());
@@ -1348,28 +1212,18 @@
        dto.setTotalArea(totalArea.setScale(2, RoundingMode.HALF_UP));

        //  å·¥è‰ºè·¯çº¿
        List<SalesLedgerProcessRoute> salesLedgerProcessRoutes = salesLedgerProcessRouteService.list(
                new LambdaQueryWrapper<SalesLedgerProcessRoute>()
                        .eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedgerId)
                        .orderByAsc(SalesLedgerProcessRoute::getDragSort));
        List<SalesLedgerProcessRoute> salesLedgerProcessRoutes = salesLedgerProcessRouteService.list(new LambdaQueryWrapper<SalesLedgerProcessRoute>().eq(SalesLedgerProcessRoute::getSalesLedgerId, salesLedgerId).orderByAsc(SalesLedgerProcessRoute::getDragSort));

        List<SalesProcessCardDto.ProcessNodeDto> nodeDtos = new ArrayList<>();

        if (CollectionUtils.isEmpty(salesLedgerProcessRoutes)) {
            // æ— è‡ªå®šä¹‰è·¯çº¿ï¼šå…ˆæŸ¥è¯¢é»˜è®¤å·¥è‰ºè·¯çº¿ï¼›è‹¥æ— é»˜è®¤ï¼ŒèŽ·å–创建时间最近的一条
            ProcessRoute fallbackRoute = processRouteMapper.selectOne(
                    new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getIsDefault, 1).last("LIMIT 1"));
            ProcessRoute fallbackRoute = processRouteMapper.selectOne(new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getIsDefault, 1).last("LIMIT 1"));
            if (fallbackRoute == null) {
                fallbackRoute = processRouteMapper.selectOne(
                        new LambdaQueryWrapper<ProcessRoute>()
                                .orderByDesc(ProcessRoute::getCreateTime)
                                .last("LIMIT 1"));
                fallbackRoute = processRouteMapper.selectOne(new LambdaQueryWrapper<ProcessRoute>().orderByDesc(ProcessRoute::getCreateTime).last("LIMIT 1"));
            }
            if (fallbackRoute != null) {
                List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(
                        new LambdaQueryWrapper<ProcessRouteItem>()
                                .eq(ProcessRouteItem::getRouteId, fallbackRoute.getId())
                                .orderByAsc(ProcessRouteItem::getDragSort));
                List<ProcessRouteItem> routeItems = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().eq(ProcessRouteItem::getRouteId, fallbackRoute.getId()).orderByAsc(ProcessRouteItem::getDragSort));
                for (ProcessRouteItem i : routeItems) {
                    SalesProcessCardDto.ProcessNodeDto node = new SalesProcessCardDto.ProcessNodeDto();
                    node.setProcessRouteItemId(i.getId());
@@ -1380,12 +1234,9 @@
            }
        } else {
            // ä½¿ç”¨è‡ªå®šä¹‰è·¯çº¿ç»‘定的节点
            List<Long> itemIds = salesLedgerProcessRoutes.stream()
                    .map(SalesLedgerProcessRoute::getProcessRouteItemId)
                    .collect(Collectors.toList());
            List<Long> itemIds = salesLedgerProcessRoutes.stream().map(SalesLedgerProcessRoute::getProcessRouteItemId).collect(Collectors.toList());
            List<ProcessRouteItem> rawItems = processRouteItemMapper.selectBatchIds(itemIds);
            Map<Long, ProcessRouteItem> itemMap = rawItems.stream()
                    .collect(Collectors.toMap(ProcessRouteItem::getId, i -> i, (a, b) -> a));
            Map<Long, ProcessRouteItem> itemMap = rawItems.stream().collect(Collectors.toMap(ProcessRouteItem::getId, i -> i, (a, b) -> a));

            for (SalesLedgerProcessRoute r : salesLedgerProcessRoutes) {
                ProcessRouteItem pi = itemMap.get(r.getProcessRouteItemId());
@@ -1402,14 +1253,9 @@

        if (!nodeDtos.isEmpty()) {
            //  dragSort è¿›è¡Œå‡åºæŽ’序
            nodeDtos.sort(Comparator.comparing(
                    SalesProcessCardDto.ProcessNodeDto::getDragSort,
                    Comparator.nullsLast(Comparator.naturalOrder())
            ));
            nodeDtos.sort(Comparator.comparing(SalesProcessCardDto.ProcessNodeDto::getDragSort, Comparator.nullsLast(Comparator.naturalOrder())));
            //  é‡æ–°ç”ŸæˆæŽ’序后的路径名称列表
            List<String> sortedPathNames = nodeDtos.stream()
                    .map(SalesProcessCardDto.ProcessNodeDto::getProcessRouteItemName)
                    .collect(Collectors.toList());
            List<String> sortedPathNames = nodeDtos.stream().map(SalesProcessCardDto.ProcessNodeDto::getProcessRouteItemName).collect(Collectors.toList());
            //  æ‹¼æŽ¥å­—符串
            dto.setProcessPathDisplay(String.join(" -> ", sortedPathNames));
            // è®¾ç½®é¡¶å±‚节点的工艺路线
@@ -1479,8 +1325,7 @@
        dto.setPrintTime(LocalDateTime.now());

        // æŸ¥è¯¢äº§å“åˆ—表
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
                new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));

        if (CollectionUtils.isNotEmpty(products)) {
            SalesLedgerProduct firstProduct = products.get(0);
@@ -1495,8 +1340,7 @@
        for (SalesLedgerProduct p : products) {
            SalesOrdersDto.SalesOrderItemDto itemDto = new SalesOrdersDto.SalesOrderItemDto();
            itemDto.setFloorCode(p.getFloorCode());
            String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") +
                    (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
            String desc = (p.getProductCategory() != null ? p.getProductCategory() : "") + (StringUtils.isNotBlank(p.getSpecificationModel()) ? " " + p.getSpecificationModel() : "");
            itemDto.setProductDescription(desc.trim());
            itemDto.setWidth(p.getWidth());
            itemDto.setHeight(p.getHeight());
@@ -1528,13 +1372,10 @@
        List<Long> productIds = products.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
        BigDecimal otherFeesTotal = BigDecimal.ZERO;
        if (CollectionUtils.isNotEmpty(productIds)) {
            List<SalesLedgerProductProcessBind> binds = salesLedgerProductProcessBindService.list(
                    new LambdaQueryWrapper<SalesLedgerProductProcessBind>().in(SalesLedgerProductProcessBind::getSalesLedgerProductId, productIds));
            List<SalesLedgerProductProcessBind> binds = salesLedgerProductProcessBindService.list(new LambdaQueryWrapper<SalesLedgerProductProcessBind>().in(SalesLedgerProductProcessBind::getSalesLedgerProductId, productIds));

            if (CollectionUtils.isNotEmpty(binds)) {
                Map<Integer, Integer> processQuantityMap = binds.stream()
                        .collect(Collectors.groupingBy(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId,
                                Collectors.summingInt(b -> b.getQuantity() != null ? b.getQuantity() : 0)));
                Map<Integer, Integer> processQuantityMap = binds.stream().collect(Collectors.groupingBy(SalesLedgerProductProcessBind::getSalesLedgerProductProcessId, Collectors.summingInt(b -> b.getQuantity() != null ? b.getQuantity() : 0)));

                List<Integer> processIds = new ArrayList<>(processQuantityMap.keySet());
                List<SalesLedgerProductProcess> processes = salesLedgerProductProcessService.listByIds(processIds);
@@ -1616,14 +1457,10 @@
//        dto.setExternalOrderNo(ledgers.get(0).getCustomerContractNo());

        //  æŸ¥è¯¢æ‰€æœ‰äº§å“
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(
                new LambdaQueryWrapper<SalesLedgerProduct>()
                        .in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds)
                        .eq(SalesLedgerProduct::getType, 1));
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, salesLedgerIds).eq(SalesLedgerProduct::getType, 1));

        if (CollectionUtils.isNotEmpty(allProducts)) {
            Map<Long, SalesLedger> ledgerMap = ledgers.stream()
                    .collect(Collectors.toMap(SalesLedger::getId, Function.identity()));
            Map<Long, SalesLedger> ledgerMap = ledgers.stream().collect(Collectors.toMap(SalesLedger::getId, Function.identity()));

            List<SalesInvoicesDto.InvoiceOrderGroupDto> groups = new ArrayList<>();
            BigDecimal totalQty = BigDecimal.ZERO;
@@ -1662,8 +1499,7 @@
                BigDecimal groupArea = BigDecimal.ZERO;

                for (SalesLedgerProduct p : products) {
                    String widthHeight = (p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") +
                            " * " + (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0");
                    String widthHeight = (p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") + " * " + (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0");
                    String floorCode = StringUtils.defaultString(p.getFloorCode(), "");
                    String remark = StringUtils.defaultString(p.getRemark(), "");
                    String processReq = StringUtils.defaultString(p.getProcessRequirement(), "");
@@ -1731,8 +1567,7 @@
        }

        // æŸ¥è¯¢äº§å“åˆ—表
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
                new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));

        // æŸ¥è¯¢å®¢æˆ·åœ°å€
        String fullAddress = "";
@@ -1762,9 +1597,7 @@
                dto.setProductName(p.getSpecificationModel());

                // å®½*高=数量
                String specification = (p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") + "*" +
                        (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0") + "=" +
                        (p.getQuantity() != null ? p.getQuantity().stripTrailingZeros().toPlainString() : "0");
                String specification = (p.getWidth() != null ? p.getWidth().stripTrailingZeros().toPlainString() : "0") + "*" + (p.getHeight() != null ? p.getHeight().stripTrailingZeros().toPlainString() : "0") + "=" + (p.getQuantity() != null ? p.getQuantity().stripTrailingZeros().toPlainString() : "0");
                dto.setSpecification(specification);

                // å®¢æˆ·åœ°å€ + æ¥¼å±‚编号
@@ -1793,22 +1626,14 @@
        return next;
    }

    public <T, S> void updateMainContractAmount(
            Long mainId,
            List<T> subList,
            Function<T, BigDecimal> amountGetter,
            BaseMapper<S> mainMapper,
            Class<S> mainEntityClass) {
    public <T, S> void updateMainContractAmount(Long mainId, List<T> subList, Function<T, BigDecimal> amountGetter, BaseMapper<S> mainMapper, Class<S> mainEntityClass) {

        if (mainId == null || subList == null || subList.isEmpty()) {
            return;
        }

        // è®¡ç®—子表金额总和
        BigDecimal totalAmount = subList.stream()
                .map(amountGetter)
                .filter(Objects::nonNull)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
        BigDecimal totalAmount = subList.stream().map(amountGetter).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

        // æž„造主表更新对象
        try {
@@ -1978,19 +1803,12 @@

    @Override
    public List<Customer> shippedCustomers() {
        List<SalesLedger> ledgers = list(Wrappers.<SalesLedger>lambdaQuery()
                .eq(SalesLedger::getDeliveryStatus, 5)
                .isNotNull(SalesLedger::getCustomerId)
                .select(SalesLedger::getCustomerId));
        List<SalesLedger> ledgers = list(Wrappers.<SalesLedger>lambdaQuery().eq(SalesLedger::getDeliveryStatus, 5).isNotNull(SalesLedger::getCustomerId).select(SalesLedger::getCustomerId));
        if (CollectionUtils.isEmpty(ledgers)) {
            return Collections.emptyList();
        }
        Set<Long> customerIds = ledgers.stream()
                .map(SalesLedger::getCustomerId)
                .collect(Collectors.toCollection(LinkedHashSet::new));
        return customerMapper.selectList(Wrappers.<Customer>lambdaQuery()
                .in(Customer::getId, customerIds)
                .orderByAsc(Customer::getCustomerName));
        Set<Long> customerIds = ledgers.stream().map(SalesLedger::getCustomerId).collect(Collectors.toCollection(LinkedHashSet::new));
        return customerMapper.selectList(Wrappers.<Customer>lambdaQuery().in(Customer::getId, customerIds).orderByAsc(Customer::getCustomerName));
    }

    @Override
@@ -2031,8 +1849,7 @@
            }
            inboundQtyByLineId.merge(inbound.getId(), inboundQty, BigDecimal::add);
        }
        List<SalesLedgerProduct> selectedProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery()
                .in(SalesLedgerProduct::getId, inboundQtyByLineId.keySet()));
        List<SalesLedgerProduct> selectedProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery().in(SalesLedgerProduct::getId, inboundQtyByLineId.keySet()));
        if (CollectionUtils.isEmpty(selectedProducts)) {
            throw new ServiceException("入库失败,未查询到入库产品");
        }
@@ -2054,17 +1871,10 @@
        if (StringUtils.isEmpty(approveUserIds)) {
            throw new ServiceException("入库失败,请选择审批人");
        }
        String lines = inboundQtyByLineId.entrySet().stream()
                .map(e -> e.getKey() + "@" + e.getValue().stripTrailingZeros().toPlainString())
                .collect(Collectors.joining(","));
        String lines = inboundQtyByLineId.entrySet().stream().map(e -> e.getKey() + "@" + e.getValue().stripTrailingZeros().toPlainString()).collect(Collectors.joining(","));
        String reason = "销售扫码合格入库审批:" + salesLedger.getSalesContractNo();
        String remark = "scanQualified:" + salesLedger.getId() + ":" + lines;
        ApproveProcess exist = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
                .eq(ApproveProcess::getApproveRemark, remark)
                .eq(ApproveProcess::getApproveDelete, 0)
                .orderByDesc(ApproveProcess::getCreateTime)
                .last("limit 1"));
        ApproveProcess exist = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>().eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode()).eq(ApproveProcess::getApproveRemark, remark).eq(ApproveProcess::getApproveDelete, 0).orderByDesc(ApproveProcess::getCreateTime).last("limit 1"));
        if (exist != null && !Objects.equals(exist.getApproveStatus(), 3)) {
            throw new ServiceException("入库失败,该申请已提交审批");
        }
@@ -2137,8 +1947,7 @@
            dbProduct.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(dbProduct);
        }
        List<SalesLedgerProduct> ledgerAllProducts = salesLedgerProductMapper.selectList(
                Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, ledgerId));
        List<SalesLedgerProduct> ledgerAllProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, ledgerId));
        boolean anyInbound = ledgerAllProducts.stream().anyMatch(p -> {
            BigDecimal sq = p.getStockedQuantity();
            return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
@@ -2178,8 +1987,7 @@
            }
            inboundQtyByLineId.merge(inbound.getId(), inboundQty, BigDecimal::add);
        }
        List<SalesLedgerProduct> selectedProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery()
                .in(SalesLedgerProduct::getId, inboundQtyByLineId.keySet()));
        List<SalesLedgerProduct> selectedProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery().in(SalesLedgerProduct::getId, inboundQtyByLineId.keySet()));
        if (CollectionUtils.isEmpty(selectedProducts)) {
            throw new ServiceException("不合格入库失败,未查询到入库产品");
        }
@@ -2201,17 +2009,10 @@
        if (StringUtils.isEmpty(approveUserIds)) {
            throw new ServiceException("不合格入库失败,请选择审批人");
        }
        String lines = inboundQtyByLineId.entrySet().stream()
                .map(e -> e.getKey() + "@" + e.getValue().stripTrailingZeros().toPlainString())
                .collect(Collectors.joining(","));
        String lines = inboundQtyByLineId.entrySet().stream().map(e -> e.getKey() + "@" + e.getValue().stripTrailingZeros().toPlainString()).collect(Collectors.joining(","));
        String reason = "销售扫码不合格入库审批:" + salesLedger.getSalesContractNo();
        String remark = "scanUnqualified:" + salesLedger.getId() + ":" + lines;
        ApproveProcess exist = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
                .eq(ApproveProcess::getApproveRemark, remark)
                .eq(ApproveProcess::getApproveDelete, 0)
                .orderByDesc(ApproveProcess::getCreateTime)
                .last("limit 1"));
        ApproveProcess exist = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>().eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode()).eq(ApproveProcess::getApproveRemark, remark).eq(ApproveProcess::getApproveDelete, 0).orderByDesc(ApproveProcess::getCreateTime).last("limit 1"));
        if (exist != null && !Objects.equals(exist.getApproveStatus(), 3)) {
            throw new ServiceException("不合格入库失败,该申请已提交审批");
        }
@@ -2258,8 +2059,7 @@
            if (dbProduct.getProductModelId() == null) {
                throw new ServiceException("不合格入库失败,产品规格未维护,无法入库");
            }
            stockUtils.addUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), inboundThisLine,
                    StockInUnQualifiedRecordTypeEnum.SALES_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
            stockUtils.addUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), inboundThisLine, StockInUnQualifiedRecordTypeEnum.SALES_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
            BigDecimal oldUnStocked = dbProduct.getUnqualifiedStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getUnqualifiedStockedQuantity();
            dbProduct.setUnqualifiedStockedQuantity(oldUnStocked.add(inboundThisLine));
            dbProduct.fillRemainingQuantity();
@@ -2271,20 +2071,13 @@
        if (StringUtils.isNotEmpty(approveUserIds)) {
            return approveUserIds;
        }
        LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<ApproveProcess>()
                .eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode())
                .eq(ApproveProcess::getApproveDelete, 0)
                .orderByDesc(ApproveProcess::getCreateTime)
                .last("limit 1");
        LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<ApproveProcess>().eq(ApproveProcess::getApproveType, ApproveTypeEnum.STOCK_IN.getCode()).eq(ApproveProcess::getApproveDelete, 0).orderByDesc(ApproveProcess::getCreateTime).last("limit 1");
        if (Objects.equals(bizType, INBOUND_BIZ_TYPE_WEB)) {
            wrapper.likeRight(ApproveProcess::getApproveReason, "入库审批:")
                    .likeRight(ApproveProcess::getApproveRemark, "salesStock:" + salesLedgerId + ":");
            wrapper.likeRight(ApproveProcess::getApproveReason, "入库审批:").likeRight(ApproveProcess::getApproveRemark, "salesStock:" + salesLedgerId + ":");
        } else if (Objects.equals(bizType, INBOUND_BIZ_TYPE_SCAN_QUALIFIED)) {
            wrapper.likeRight(ApproveProcess::getApproveReason, "销售扫码合格入库审批:")
                    .likeRight(ApproveProcess::getApproveRemark, "scanQualified:" + salesLedgerId + ":");
            wrapper.likeRight(ApproveProcess::getApproveReason, "销售扫码合格入库审批:").likeRight(ApproveProcess::getApproveRemark, "scanQualified:" + salesLedgerId + ":");
        } else if (Objects.equals(bizType, INBOUND_BIZ_TYPE_SCAN_UNQUALIFIED)) {
            wrapper.likeRight(ApproveProcess::getApproveReason, "销售扫码不合格入库审批:")
                    .likeRight(ApproveProcess::getApproveRemark, "scanUnqualified:" + salesLedgerId + ":");
            wrapper.likeRight(ApproveProcess::getApproveReason, "销售扫码不合格入库审批:").likeRight(ApproveProcess::getApproveRemark, "scanUnqualified:" + salesLedgerId + ":");
        } else {
            return null;
        }
@@ -2356,8 +2149,7 @@
            dbProduct.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(dbProduct);
        }
        List<SalesLedgerProduct> ledgerAllProducts = salesLedgerProductMapper.selectList(
                Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, ledgerId));
        List<SalesLedgerProduct> ledgerAllProducts = salesLedgerProductMapper.selectList(Wrappers.<SalesLedgerProduct>lambdaQuery().eq(SalesLedgerProduct::getSalesLedgerId, ledgerId));
        boolean anyInbound = ledgerAllProducts.stream().anyMatch(p -> {
            BigDecimal sq = p.getStockedQuantity();
            return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
@@ -2422,12 +2214,585 @@
                throw new ServiceException("不合格出库失败,出库数量不能大于不合格入库数量");
            }
            stockUtils.assertUnqualifiedAvailable(dbProduct.getProductModelId(), outboundThisLine);
            stockUtils.subtractUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), outboundThisLine,
                    StockOutUnQualifiedRecordTypeEnum.SALE_SCAN_UNSTOCK_OUT.getCode(), dbProduct.getId());
            stockUtils.subtractUnStock(ledgerId, dbProduct.getId(), dbProduct.getProductModelId(), outboundThisLine, StockOutUnQualifiedRecordTypeEnum.SALE_SCAN_UNSTOCK_OUT.getCode(), dbProduct.getId());

            dbProduct.setUnqualifiedShippedQuantity(unShipped.add(outboundThisLine));
            dbProduct.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(dbProduct);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void shippingImport(MultipartFile file) {
        if (file == null || file.isEmpty()) {
            throw new ServiceException("导入失败,导入文件数据不能为空");
        }
        List<SalesShippingImportDto> list;
        try {
            ExcelUtil<SalesShippingImportDto> excelUtil = new ExcelUtil<>(SalesShippingImportDto.class);
            list = excelUtil.importExcel(file.getInputStream());
        } catch (Exception e) {
            log.error("销售发货历史数据导入-已发货导入失败: {}", e.getMessage());
            throw new ServiceException("导入失败,数据读取异常");
        }
        if (CollectionUtils.isEmpty(list)) {
            throw new ServiceException("导入失败,文件数据为空");
        }
        Map<String, List<SalesShippingImportDto>> groupedByOrderNo = list.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(SalesShippingImportDto::getOrderNo, LinkedHashMap::new, Collectors.toList()));

        for (Map.Entry<String, List<SalesShippingImportDto>> entry : groupedByOrderNo.entrySet()) {
            String orderNo = entry.getKey();
            if (!StringUtils.hasText(orderNo)) {
                throw new ServiceException("导入失败,存在订单编号为空的数据");
            }
            List<SalesShippingImportDto> rowList = entry.getValue();
            if (CollectionUtils.isEmpty(rowList)) {
                continue;
            }
            SalesLedger ledger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
            if (ledger == null) {
                throw new ServiceException("导入失败,订单编号[" + orderNo + "]不存在,无法补录已发货数据");
            }
            List<SalesLedgerProduct> dbProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
            if (CollectionUtils.isEmpty(dbProducts)) {
                throw new ServiceException("导入失败,订单编号[" + orderNo + "]没有销售产品,无法补录发货");
            }
            Map<String, List<SalesLedgerProduct>> productByCategory = dbProducts.stream().collect(Collectors.groupingBy(p -> StringUtils.hasText(p.getProductCategory()) ? p.getProductCategory().trim() : ""));
            Set<String> importedRowKeys = new HashSet<>();

            for (SalesShippingImportDto row : rowList) {
                BigDecimal shipQty = defaultDecimal(row.getQuantity());
                if (shipQty.compareTo(BigDecimal.ZERO) <= 0) {
                    throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
                }
                String rowKey = buildShippingRowKey(ledger.getId(), row);
                if (!importedRowKeys.add(rowKey)) {
                    throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货明细行");
                }
                Map<SalesLedgerProduct, BigDecimal> allocations = allocateShippingProductLines(orderNo, row, productByCategory, dbProducts);
                for (Map.Entry<SalesLedgerProduct, BigDecimal> alloc : allocations.entrySet()) {
                    SalesLedgerProduct dbProduct = alloc.getKey();
                    BigDecimal allocQty = alloc.getValue();
                    if (dbProduct.getProductModelId() == null) {
                        throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品规格未维护,无法补录出库");
                    }
                    BigDecimal oldShipped = defaultDecimal(dbProduct.getShippedQuantity());
                    BigDecimal newShipped = oldShipped.add(allocQty);
                    dbProduct.setStockedQuantity(defaultDecimal(dbProduct.getQuantity()));
                    dbProduct.setShippedQuantity(newShipped);
                    updateProductStockStatus(dbProduct);
                    dbProduct.fillRemainingQuantity();
                    updateProductShipStatus(dbProduct);
                    salesLedgerProductMapper.updateById(dbProduct);

                    ShippingInfo shippingInfo = new ShippingInfo();
                    shippingInfo.setSalesLedgerId(ledger.getId());
                    shippingInfo.setSalesLedgerProductId(dbProduct.getId());
                    shippingInfo.setStatus("已发货");
                    shippingInfo.setShippingNo(row.getShippingNo());
                    shippingInfo.setType("货车");
                    shippingInfo.setShippingCarNumber("无");
                    shippingInfo.setShippingDate(row.getReportDate());
                    long existedShippingCount = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>().eq(ShippingInfo::getSalesLedgerId, ledger.getId()).eq(ShippingInfo::getSalesLedgerProductId, dbProduct.getId()).eq(StringUtils.hasText(row.getShippingNo()), ShippingInfo::getShippingNo, row.getShippingNo()).eq(row.getReportDate() != null, ShippingInfo::getShippingDate, row.getReportDate()));
                    if (existedShippingCount > 0) {
                        throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在重复发货记录,请勿重复导入");
                    }
                    shippingInfoMapper.insert(shippingInfo);
                }
            }

            List<SalesLedgerProduct> latestProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().eq(SalesLedgerProduct::getSalesLedgerId, ledger.getId()).eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
            boolean allShipped = CollectionUtils.isNotEmpty(latestProducts) && latestProducts.stream().allMatch(p -> {
                BigDecimal qty = defaultDecimal(p.getQuantity());
                BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
                return shipped.compareTo(qty) >= 0;
            });
            if (allShipped && rowList.get(0).getReportDate() != null) {
                ledger.setDeliveryDate(DateUtils.toLocalDate(rowList.get(0).getReportDate()));
            }
            ledger.setDeliveryStatus(allShipped ? 5 : 1);
            salesLedgerMapper.updateById(ledger);
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void notShippingImport(MultipartFile file) {
        if (file == null || file.isEmpty()) {
            throw new ServiceException("导入失败,导入文件数据不能为空");
        }
        List<SalesNotShippingImportDto> list;
        try {
            ExcelUtil<SalesNotShippingImportDto> excelUtil = new ExcelUtil<>(SalesNotShippingImportDto.class);
            list = excelUtil.importExcel(file.getInputStream());
        } catch (Exception e) {
            log.error("销售发货历史数据导入-未发货导入失败: {}", e.getMessage());
            throw new ServiceException("导入失败,数据读取异常");
        }
        if (CollectionUtils.isEmpty(list)) {
            throw new ServiceException("导入失败,文件数据为空");
        }
        List<SysUser> allUsers = sysUserMapper.selectList(null);
        Map<String, SysUser> userByNickNameMap = allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getNickName())).collect(Collectors.toMap(SysUser::getNickName, Function.identity(), (a, b) -> a));
        Map<String, SysUser> userByUserNameMap = allUsers.stream().filter(Objects::nonNull).filter(u -> StringUtils.hasText(u.getUserName())).collect(Collectors.toMap(SysUser::getUserName, Function.identity(), (a, b) -> a));

        Map<String, Customer> customerNameMap = customerMapper.selectList(null).stream().filter(Objects::nonNull).filter(c -> StringUtils.hasText(c.getCustomerName())).collect(Collectors.toMap(Customer::getCustomerName, Function.identity(), (a, b) -> a));
        List<CustomerRegions> allRegions = customerRegionsService.list();
        CustomerRegions hebiRegion = allRegions.stream().filter(Objects::nonNull).filter(r -> "鹤壁".equals(r.getRegionsName())).findFirst().orElseGet(() -> {
            CustomerRegions region = new CustomerRegions();
            region.setRegionsName("鹤壁");
            region.setParentId(0L);
            customerRegionsService.save(region);
            return region;
        });
        Map<String, Product> productNameMap = productMapper.selectList(null).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProductName())).collect(Collectors.toMap(Product::getProductName, Function.identity(), (a, b) -> a));
        Product finishedGoodsParent = productNameMap.get("成品");
        if (finishedGoodsParent == null || finishedGoodsParent.getId() == null) {
            finishedGoodsParent = new Product();
            finishedGoodsParent.setProductName("成品");
            finishedGoodsParent.setParentId(null);
            productMapper.insert(finishedGoodsParent);
            productNameMap.put("成品", finishedGoodsParent);
        }
        Map<String, ProductModel> productModelKeyMap = productModelMapper.selectList(null).stream().filter(Objects::nonNull).filter(m -> m.getProductId() != null && StringUtils.hasText(m.getModel())).collect(Collectors.toMap(m -> buildProductModelKey(m.getProductId(), m.getModel()), Function.identity(), (a, b) -> a));

        List<String> extraProcessNames = Arrays.asList("打孔", "挖缺", "安全角", "磨边");
        Map<String, SalesLedgerProductProcess> processMap = salesLedgerProductProcessService.list(new LambdaQueryWrapper<SalesLedgerProductProcess>().in(SalesLedgerProductProcess::getProcessName, extraProcessNames)).stream().filter(Objects::nonNull).filter(p -> StringUtils.hasText(p.getProcessName())).collect(Collectors.toMap(SalesLedgerProductProcess::getProcessName, Function.identity(), (a, b) -> a));
        List<ProcessRoute> processRoutes = processRouteMapper.selectList(new LambdaQueryWrapper<ProcessRoute>().eq(ProcessRoute::getProductModelId, 0L));
        Map<String, ProcessRoute> routeNameMap = processRoutes.stream().filter(Objects::nonNull).filter(r -> StringUtils.hasText(r.getProcessRouteName())).collect(Collectors.toMap(r -> normalizeRouteFlowKey(r.getProcessRouteName()), Function.identity(), this::chooseBetterRoute));
        Map<Long, List<ProcessRouteItem>> routeItemMap = Collections.emptyMap();
        List<Long> routeIds = processRoutes.stream().map(ProcessRoute::getId).filter(Objects::nonNull).collect(Collectors.toList());
        if (CollectionUtils.isNotEmpty(routeIds)) {
            routeItemMap = processRouteItemMapper.selectList(new LambdaQueryWrapper<ProcessRouteItem>().in(ProcessRouteItem::getRouteId, routeIds).orderByAsc(ProcessRouteItem::getDragSort).orderByAsc(ProcessRouteItem::getId)).stream().filter(Objects::nonNull).collect(Collectors.groupingBy(ProcessRouteItem::getRouteId));
        }

        Map<String, List<SalesNotShippingImportDto>> groupedByOrderNo = list.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(SalesNotShippingImportDto::getOrderNo, LinkedHashMap::new, Collectors.toList()));

        for (Map.Entry<String, List<SalesNotShippingImportDto>> entry : groupedByOrderNo.entrySet()) {
            String orderNo = entry.getKey();
            if (!StringUtils.hasText(orderNo)) {
                throw new ServiceException("导入失败,存在订单编号为空的数据");
            }
            List<SalesNotShippingImportDto> rowList = entry.getValue();
            if (CollectionUtils.isEmpty(rowList)) {
                continue;
            }
            SalesNotShippingImportDto first = rowList.get(0);
            SalesLedger exists = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>().eq(SalesLedger::getSalesContractNo, orderNo).last("LIMIT 1"));
            if (exists != null) {
                throw new ServiceException("导入失败,订单编号[" + orderNo + "]已存在");
            }

            SalesLedger ledger = new SalesLedger();
            SysUser creatorUser = resolveImportUser(first.getCreator(), userByNickNameMap, userByUserNameMap, "制单员", orderNo);
            ledger.setSalesContractNo(orderNo);
            ledger.setCustomerContractNo(first.getContractNo());
            ledger.setProjectName(first.getProjectName());
            ledger.setSalesman(first.getSalesman());
            Customer customer = getOrCreateImportCustomer(first.getCustomerName(), customerNameMap, hebiRegion.getId());
            ledger.setCustomerName(customer.getCustomerName());
            ledger.setRemarks(first.getRemark());
            ledger.setEntryPerson(String.valueOf(creatorUser.getUserId()));
            ledger.setEntryDate(first.getReportDate());
            if (first.getReportDate() != null) {
                ledger.setExecutionDate(DateUtils.toLocalDate(first.getReportDate()));
            }
            ledger.setDeliveryDate(first.getDeliveryDeadline() == null ? (first.getReportDate() == null ? LocalDate.now().plusDays(7) : DateUtils.toLocalDate(first.getReportDate()).plusDays(7)) : DateUtils.toLocalDate(first.getDeliveryDeadline()));
            ledger.setDeliveryStatus(1);
            ledger.setStockStatus(0);

            ledger.setCustomerId(customer.getId());
            ledger.setCustomerContractNo(StringUtils.hasText(ledger.getCustomerContractNo()) ? ledger.getCustomerContractNo() : customer.getTaxpayerIdentificationNumber());

            ledger.setContractAmount(BigDecimal.ZERO);
            salesLedgerMapper.insert(ledger);
            bindImportProcessRoute(ledger.getId(), rowList, routeNameMap, routeItemMap);

            BigDecimal contractAmount = BigDecimal.ZERO;
            for (SalesNotShippingImportDto row : rowList) {
                SalesLedgerProduct product = new SalesLedgerProduct();
                product.setSalesLedgerId(ledger.getId());
                product.setType(SaleEnum.SALE.getCode());
                String specificationModel = buildSpecificationModel(row);
                Product importProduct = resolveOrCreateImportProduct(row, productNameMap, finishedGoodsParent, orderNo);
                ProductModel importProductModel = resolveOrCreateImportProductModel(importProduct, specificationModel, row.getGlassThickness(), productModelKeyMap);
                product.setProductCategory(row.getProductSubCategory());
                product.setSpecificationModel(specificationModel);
                product.setProductId(importProduct.getId());
                product.setProductModelId(importProductModel.getId());
                product.setFloorCode(row.getFloorNo());
                product.setWidth(defaultDecimal(row.getWidth()));
                product.setHeight(defaultDecimal(row.getHeight()));
                product.setQuantity(defaultDecimal(row.getQuantity()));
                product.setActualPieceArea(defaultDecimal(row.getActualSingleArea()));
                product.setActualTotalArea(defaultDecimal(row.getActualTotalArea()));
                product.setSettlePieceArea(defaultDecimal(row.getSettlementSingleArea()));
                product.setSettleTotalArea(defaultDecimal(row.getSettlementTotalArea()));
                product.setTaxInclusiveUnitPrice(defaultDecimal(row.getUnitPrice()));
                product.setPerimeter(defaultDecimal(row.getPerimeter()));
                product.setHeavyBox(defaultDecimal(row.getHeavyBox()));
                product.setProcessRequirement(row.getProcessRequirement());
                product.setRemark(StringUtils.hasText(row.getAuditRemark()) ? row.getAuditRemark() : row.getRemark());
                product.setApproveStatus(0);
                product.setProductStockStatus(0);
                product.setRegister(creatorUser.getNickName());
                product.setRegisterDate(row.getReportDate() == null ? LocalDateTime.now() : LocalDateTime.ofInstant(row.getReportDate().toInstant(), ZoneId.systemDefault()));

                BigDecimal qty = defaultDecimal(product.getQuantity());
                if (qty.compareTo(BigDecimal.ZERO) <= 0) {
                    throw new ServiceException("导入失败,订单编号[" + orderNo + "]存在数量小于等于0的数据");
                }

                BigDecimal lineAmount = defaultDecimal(row.getGlassAmount()).add(defaultDecimal(row.getOtherProcessFee()));
                if (lineAmount.compareTo(BigDecimal.ZERO) <= 0 && product.getTaxInclusiveUnitPrice().compareTo(BigDecimal.ZERO) > 0 && product.getSettleTotalArea().compareTo(BigDecimal.ZERO) > 0) {
                    lineAmount = product.getTaxInclusiveUnitPrice().multiply(product.getSettleTotalArea()).setScale(2, RoundingMode.HALF_UP);
                }
                product.setTaxRate(BigDecimal.ZERO);
                product.setTaxInclusiveTotalPrice(lineAmount);
                product.setTaxExclusiveTotalPrice(lineAmount);
                product.setNoInvoiceNum(qty);
                product.setNoInvoiceAmount(lineAmount);
                product.setPendingInvoiceTotal(lineAmount);
                product.fillRemainingQuantity();
                salesLedgerProductMapper.insert(product);

                List<SalesLedgerProductProcess> bindProcessList = buildImportProcessBinds(row, processMap);
                if (CollectionUtils.isNotEmpty(bindProcessList)) {
                    salesLedgerProductProcessBindService.updateProductProcessBind(bindProcessList, product.getId());
                }

                salesLedgerProductServiceImpl.addProductionData(product);
                contractAmount = contractAmount.add(lineAmount);
            }

            ledger.setContractAmount(contractAmount);
            salesLedgerMapper.updateById(ledger);
        }
    }

    private List<SalesLedgerProductProcess> buildImportProcessBinds(SalesNotShippingImportDto row, Map<String, SalesLedgerProductProcess> processMap) {
        LinkedHashMap<String, Integer> processQuantityMap = new LinkedHashMap<>();
        mergeProcessQuantity(processQuantityMap, "打孔", toProcessQuantity(row.getDrilling()));
        mergeProcessQuantity(processQuantityMap, "挖缺", toProcessQuantity(row.getNotching()));
        mergeProcessQuantity(processQuantityMap, "安全角", toProcessQuantity(row.getSafetyCorner()));
        mergeProcessQuantity(processQuantityMap, "磨边", toProcessQuantity(row.getGrindingIrregular()));

        List<SalesLedgerProductProcess> result = new ArrayList<>();
        for (Map.Entry<String, Integer> entry : processQuantityMap.entrySet()) {
            if (entry.getValue() == null || entry.getValue() <= 0) {
                continue;
            }
            SalesLedgerProductProcess process = processMap.get(entry.getKey());
            if (process == null || process.getId() == null) {
                log.warn("导入工艺未找到配置, processName={}, orderNo={}", entry.getKey(), row.getOrderNo());
                continue;
            }
            SalesLedgerProductProcess bind = new SalesLedgerProductProcess();
            bind.setId(process.getId());
            bind.setQuantity(entry.getValue());
            result.add(bind);
        }
        return result;
    }

    private void bindImportProcessRoute(Long salesLedgerId, List<SalesNotShippingImportDto> rowList, Map<String, ProcessRoute> routeNameMap, Map<Long, List<ProcessRouteItem>> routeItemMap) {
        String flowKey = rowList.stream().map(SalesNotShippingImportDto::getProcessFlow).filter(StringUtils::hasText).map(this::normalizeRouteFlowKey).filter(StringUtils::hasText).findFirst().orElse("");
        if (!StringUtils.hasText(flowKey)) {
            throw new ServiceException("导入失败,订单工艺流程不能为空");
        }
        ProcessRoute route = routeNameMap.get(flowKey);
        if (route == null || route.getId() == null) {
            route = createImportProcessRoute(flowKey, routeNameMap, routeItemMap);
        }
        List<ProcessRouteItem> routeItems = routeItemMap.getOrDefault(route.getId(), Collections.emptyList());
        if (CollectionUtils.isEmpty(routeItems)) {
            route = createImportProcessRoute(flowKey, routeNameMap, routeItemMap);
            routeItems = routeItemMap.getOrDefault(route.getId(), Collections.emptyList());
            if (CollectionUtils.isEmpty(routeItems)) {
                throw new ServiceException("导入失败,工艺路线[" + flowKey + "]未配置工艺节点");
            }
        }
        List<SalesLedgerProcessRoute> bindList = new ArrayList<>();
        for (ProcessRouteItem item : routeItems) {
            SalesLedgerProcessRoute bind = new SalesLedgerProcessRoute();
            bind.setSalesLedgerId(salesLedgerId);
            bind.setProcessRouteId(route.getId());
            bind.setProcessRouteItemId(item.getId());
            bind.setDragSort(item.getDragSort());
            bindList.add(bind);
        }
        salesLedgerProcessRouteService.saveBatch(bindList);
    }

    private ProcessRoute createImportProcessRoute(String flowKey, Map<String, ProcessRoute> routeNameMap, Map<Long, List<ProcessRouteItem>> routeItemMap) {
        List<String> processNames = Arrays.stream(flowKey.split("->")).filter(StringUtils::hasText).map(String::trim).collect(Collectors.toList());
        if (CollectionUtils.isEmpty(processNames)) {
            throw new ServiceException("导入失败,工艺路线[" + flowKey + "]解析失败");
        }
        ProcessRoute route = new ProcessRoute();
        route.setProductModelId(0L);
        route.setProcessRouteName(flowKey);
        route.setIsDefault(0);
        route.setDescription("");
        route.setProcessRouteCode("AUTO_" + System.currentTimeMillis());
        processRouteMapper.insert(route);
        List<ProcessRouteItem> routeItems = new ArrayList<>();
        for (int i = 0; i < processNames.size(); i++) {
            ProcessRouteItem item = new ProcessRouteItem();
            item.setRouteId(route.getId());
            item.setProductModelId(0L);
            item.setProcessId(0L);
            item.setProcessName(processNames.get(i));
            item.setDragSort(i + 1);
            item.setIsQuality(Boolean.TRUE);
            processRouteItemMapper.insert(item);
            routeItems.add(item);
        }
        routeNameMap.put(flowKey, route);
        routeItemMap.put(route.getId(), routeItems);
        return route;
    }

    private void mergeProcessQuantity(Map<String, Integer> processQuantityMap, String processName, Integer quantity) {
        if (!StringUtils.hasText(processName) || quantity == null || quantity <= 0) {
            return;
        }
        Integer old = processQuantityMap.get(processName);
        if (old == null || old <= 0) {
            processQuantityMap.put(processName, quantity);
        }
    }

    private String normalizeRouteFlowKey(String processFlow) {
        if (!StringUtils.hasText(processFlow)) {
            return "";
        }
        return Arrays.stream(processFlow.trim().split("\\s*(?:->|→|=>|＞)\\s*")).filter(StringUtils::hasText).map(String::trim).collect(Collectors.joining("->"));
    }

    private ProcessRoute chooseBetterRoute(ProcessRoute a, ProcessRoute b) {
        if (a == null) {
            return b;
        }
        if (b == null) {
            return a;
        }
        boolean aDefault = Objects.equals(a.getIsDefault(), 1);
        boolean bDefault = Objects.equals(b.getIsDefault(), 1);
        if (aDefault != bDefault) {
            return aDefault ? a : b;
        }
        LocalDateTime aTime = a.getCreateTime();
        LocalDateTime bTime = b.getCreateTime();
        if (aTime == null) {
            return b;
        }
        if (bTime == null) {
            return a;
        }
        return bTime.isAfter(aTime) ? b : a;
    }

    private Integer toProcessQuantity(BigDecimal value) {
        if (value == null) {
            return null;
        }
        if (value.compareTo(BigDecimal.ZERO) <= 0) {
            return 0;
        }
        return value.setScale(0, RoundingMode.HALF_UP).intValue();
    }

    private SysUser resolveImportUser(String rawName, Map<String, SysUser> userByNickNameMap, Map<String, SysUser> userByUserNameMap, String fieldName, String orderNo) {
        if (!StringUtils.hasText(rawName)) {
            throw new ServiceException("导入失败,订单编号[" + orderNo + "]的[" + fieldName + "]不能为空");
        }
        String key = rawName.trim();
        SysUser user = userByNickNameMap.get(key);
        if (user == null) {
            user = userByUserNameMap.get(key);
        }
        if (user == null || user.getUserId() == null) {
            throw new ServiceException("导入失败,订单编号[" + orderNo + "]的[" + fieldName + ":" + key + "]未匹配到人员");
        }
        return user;
    }

    private Customer getOrCreateImportCustomer(String customerName, Map<String, Customer> customerNameMap, Long hebiRegionId) {
        if (!StringUtils.hasText(customerName)) {
            throw new ServiceException("导入失败,客户名称不能为空");
        }
        String key = customerName.trim();
        Customer exists = customerNameMap.get(key);
        if (exists != null && exists.getId() != null) {
            return exists;
        }
        Customer customer = new Customer();
        customer.setCustomerName(key);
        customer.setRegionsId(hebiRegionId);
        customerMapper.insert(customer);
        customerNameMap.put(key, customer);
        return customer;
    }

    private Product resolveOrCreateImportProduct(SalesNotShippingImportDto row, Map<String, Product> productNameMap, Product finishedGoodsParent, String orderNo) {
        String productName = row.getProductName();
        if (StringUtils.hasText(productName)) {
            Product product = productNameMap.get(productName.trim());
            if (product != null && product.getId() != null) {
                return product;
            }
        }
        String productSubCategory = row.getProductSubCategory();
        if (StringUtils.hasText(productSubCategory)) {
            Product product = productNameMap.get(productSubCategory.trim());
            if (product != null && product.getId() != null) {
                return product;
            }
        }
        String newProductName = buildCategoryProductName(row);
        if (!StringUtils.hasText(newProductName)) {
            throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品名称和产品分类均为空");
        }
        Product created = new Product();
        created.setParentId(finishedGoodsParent == null ? null : finishedGoodsParent.getId());
        created.setProductName(newProductName);
        productMapper.insert(created);
        productNameMap.put(newProductName, created);
        return created;
    }

    private ProductModel resolveOrCreateImportProductModel(Product product, String modelName, BigDecimal thickness, Map<String, ProductModel> productModelKeyMap) {
        if (product == null || product.getId() == null || !StringUtils.hasText(modelName)) {
            throw new ServiceException("导入失败,产品规格数据不完整");
        }
        String key = buildProductModelKey(product.getId(), modelName);
        ProductModel exists = productModelKeyMap.get(key);
        if (exists != null && exists.getId() != null) {
            return exists;
        }
        ProductModel created = new ProductModel();
        created.setProductId(product.getId());
        created.setModel(modelName.trim());
        created.setThickness(thickness);
        productModelMapper.insert(created);
        productModelKeyMap.put(key, created);
        return created;
    }

    private String buildSpecificationModel(SalesNotShippingImportDto row) {
        if (StringUtils.hasText(row.getProductName())) {
            return row.getProductName().trim();
        }
        if (StringUtils.hasText(row.getProductSubCategory())) {
            return row.getProductSubCategory().trim();
        }
        if (StringUtils.hasText(row.getProductCategory())) {
            return row.getProductCategory().trim();
        }
        return "";
    }

    private String buildCategoryProductName(SalesNotShippingImportDto row) {
        String category = row.getProductCategory();
        String subCategory = row.getProductSubCategory();
        if (StringUtils.hasText(category) && StringUtils.hasText(subCategory)) {
            return category.trim() + "-" + subCategory.trim();
        }
        if (StringUtils.hasText(subCategory)) {
            return subCategory.trim();
        }
        if (StringUtils.hasText(category)) {
            return category.trim();
        }
        return "";
    }

    private String buildProductModelKey(Long productId, String modelName) {
        return productId + "||" + modelName.trim();
    }

    private String buildCategoryProductName(SalesShippingImportDto row) {
        String category = row.getProductCategory();
        String subCategory = row.getProductSubCategory();
        if (StringUtils.hasText(category) && StringUtils.hasText(subCategory)) {
            return category.trim() + "-" + subCategory.trim();
        }
        if (StringUtils.hasText(subCategory)) {
            return subCategory.trim();
        }
        if (StringUtils.hasText(category)) {
            return category.trim();
        }
        return "";
    }

    private Integer parseInteger(String value) {
        if (!StringUtils.hasText(value)) {
            return 0;
        }
        try {
            return new BigDecimal(value.trim()).setScale(0, RoundingMode.HALF_UP).intValue();
        } catch (Exception e) {
            return 0;
        }
    }

    private Map<SalesLedgerProduct, BigDecimal> allocateShippingProductLines(String orderNo, SalesShippingImportDto row, Map<String, List<SalesLedgerProduct>> productByCategory, List<SalesLedgerProduct> allProducts) {
        String subCategory = StringUtils.hasText(row.getProductSubCategory()) ? row.getProductSubCategory().trim() : "";
        List<SalesLedgerProduct> candidates = productByCategory.getOrDefault(subCategory, Collections.emptyList());
        if (CollectionUtils.isEmpty(candidates)) {
            candidates = allProducts;
        }
        BigDecimal remaining = defaultDecimal(row.getQuantity());
        Map<SalesLedgerProduct, BigDecimal> allocations = new LinkedHashMap<>();
        for (SalesLedgerProduct p : candidates) {
            BigDecimal qty = defaultDecimal(p.getQuantity());
            BigDecimal shipped = defaultDecimal(p.getShippedQuantity());
            BigDecimal canShip = qty.subtract(shipped);
            if (canShip.compareTo(BigDecimal.ZERO) <= 0) {
                continue;
            }
            BigDecimal alloc = remaining.min(canShip);
            if (alloc.compareTo(BigDecimal.ZERO) > 0) {
                allocations.put(p, alloc);
                remaining = remaining.subtract(alloc);
            }
            if (remaining.compareTo(BigDecimal.ZERO) <= 0) {
                return allocations;
            }
        }
        if (remaining.compareTo(BigDecimal.ZERO) > 0) {
            throw new ServiceException("导入失败,订单编号[" + orderNo + "]产品[" + subCategory + "]发货数量超出剩余可发数量");
        }
        return allocations;
    }

    private void updateProductShipStatus(SalesLedgerProduct dbProduct) {
        BigDecimal qty = defaultDecimal(dbProduct.getQuantity());
        BigDecimal shipped = defaultDecimal(dbProduct.getShippedQuantity());
        if (shipped.compareTo(BigDecimal.ZERO) <= 0) {
            dbProduct.setProductStockStatus(0);
            return;
        }
        dbProduct.setProductStockStatus(shipped.compareTo(qty) >= 0 ? 2 : 1);
    }

    private void updateProductStockStatus(SalesLedgerProduct dbProduct) {
        BigDecimal qty = defaultDecimal(dbProduct.getQuantity());
        BigDecimal stocked = defaultDecimal(dbProduct.getStockedQuantity());
        if (stocked.compareTo(BigDecimal.ZERO) <= 0) {
            dbProduct.setProductStockStatus(0);
            return;
        }
        dbProduct.setProductStockStatus(stocked.compareTo(qty) >= 0 ? 2 : 1);
    }

    private String buildShippingRowKey(Long ledgerId, SalesShippingImportDto row) {
        String shippingNo = StringUtils.hasText(row.getShippingNo()) ? row.getShippingNo().trim() : "";
        String dateStr = row.getReportDate() == null ? "" : String.valueOf(row.getReportDate().getTime());
        String subCategory = StringUtils.hasText(row.getProductSubCategory()) ? row.getProductSubCategory().trim() : "";
        return ledgerId + "|" + subCategory + "|" + shippingNo + "|" + dateStr + "|" + defaultDecimal(row.getQuantity());
    }
}