Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 68b27795ae929f5300fc6fb301b31aada74a2e2f

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java

@@ -118,6 +118,9 @@
    @Resource
    private TmsShelfMapper tmsShelfMapper;

    @Autowired
    private ITmsDispatchOrderImportLogService tmsDispatchOrderImportLogService;


    /**
     * 查询调度单管理
@@ -442,7 +445,7 @@

            TmsDispatchOrderImport tmsDispatchOrderImport = new TmsDispatchOrderImport();
            tmsDispatchOrderImport.setProjectName("XXX项目");
            tmsDispatchOrderImport.setTransportLine("广东省/珠海市/香洲区>香港特别行政区");
            tmsDispatchOrderImport.setTransportLine("广东省/珠海市/香洲区->香港特别行政区");
            tmsDispatchOrderImport.setRequiredVehicleTypes("10T");
            tmsDispatchOrderImport.setOrderType("基础订单");
            tmsDispatchOrderImport.setIsCustoms("是");
@@ -548,7 +551,17 @@
        int failureNum = 0;
        StringBuilder successMsg = new StringBuilder();
        StringBuilder failureMsg = new StringBuilder();
        StringBuilder failureDescription = new StringBuilder();
        int line = 1;
        
        // 创建导入日志对象
        TmsDispatchOrderImportLog importLog = new TmsDispatchOrderImportLog();
        importLog.setImportTime(DateUtils.getNowDate());
        importLog.setFileName("调度单导入文件"); // 这里需要根据实际情况获取文件名
        importLog.setOperator(SecurityUtils.getUsername());
        importLog.setCreateBy(SecurityUtils.getUsername());
        importLog.setCreateTime(DateUtils.getNowDate());
        
        for (TmsDispatchOrderImport tmsDispatchOrderImport : list){
            try
            {
@@ -722,10 +735,26 @@
                failureNum++;
                String msg = "<br/>" +  "调度单第"+line+"行导入失败：";
                failureMsg.append(msg + e.getMessage());
                
                // 记录失败说明，包含行号和失败原因
                failureDescription.append("第" + line + "行：" + e.getMessage()).append("\n");
                
                log.error(msg, e);
            }finally {
                line++;
            }
        }

        // 设置导入日志的统计信息
        importLog.setSuccessCount(list.size() - failureNum);
        importLog.setFailureCount(failureNum);
        importLog.setFailureDescription(failureDescription.toString());
        
        // 保存导入日志
        try {
            tmsDispatchOrderImportLogService.insertTmsDispatchOrderImportLog(importLog);
        } catch (Exception e) {
            log.error("保存导入日志失败：", e);
        }

        if (failureNum > 0)
@@ -787,6 +816,31 @@
    }

    @Override
    public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo)
    {
        return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
                .in(TmsDispatchOrder::getDispatchNo,dispatchOrderVo.getDispatchNos())
                .set(dispatchOrderVo.getShipperId()!=null,TmsDispatchOrder::getShipperId,dispatchOrderVo.getShipperId())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperName()),TmsDispatchOrder::getShipperName,dispatchOrderVo.getShipperName())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperRegionLabel()),TmsDispatchOrder::getShipperRegionLabel,dispatchOrderVo.getShipperRegionLabel())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperAddress()),TmsDispatchOrder::getShipperAddress,dispatchOrderVo.getShipperAddress())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperMobile()),TmsDispatchOrder::getShipperMobile,dispatchOrderVo.getShipperMobile())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperRegionCode()),TmsDispatchOrder::getShipperRegionCode,dispatchOrderVo.getShipperRegionCode())

                .set(dispatchOrderVo.getReceiverId()!=null,TmsDispatchOrder::getReceiverId,dispatchOrderVo.getReceiverId())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverName()),TmsDispatchOrder::getReceiverName,dispatchOrderVo.getReceiverName())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverRegionLabel()),TmsDispatchOrder::getReceiverRegionLabel,dispatchOrderVo.getReceiverRegionLabel())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverAddress()),TmsDispatchOrder::getReceiverAddress,dispatchOrderVo.getReceiverAddress())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverMobile()),TmsDispatchOrder::getReceiverMobile,dispatchOrderVo.getReceiverMobile())
                .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverRegionCode()),TmsDispatchOrder::getReceiverRegionCode,dispatchOrderVo.getReceiverRegionCode())

                .set(TmsDispatchOrder::getUpdateBy,SecurityUtils.getUsername())
                .set(TmsDispatchOrder::getUpdateTime,DateUtils.getNowDate())
        );

    }

    @Override
    public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder)
    {
        return tmsDispatchOrderMapper.update(null,new LambdaUpdateWrapper<TmsDispatchOrder>()