diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportPlanVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportPlanVO.java index f053294..ee70c42 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportPlanVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportPlanVO.java @@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.transport.pojo.entity.TransportPlan; -import org.springblade.transport.pojo.entity.Waybill; import java.io.Serial; import java.util.List; @@ -66,7 +65,7 @@ public class TransportPlanVO extends TransportPlan { @TableField(exist = false) @Schema(description = "计划调度生成的运单") - private List dispatchRows; + private List dispatchRows; } diff --git a/blade-service/blade-file/src/main/java/org/springblade/file/service/impl/FileTaskServiceImpl.java b/blade-service/blade-file/src/main/java/org/springblade/file/service/impl/FileTaskServiceImpl.java index 1f64964..b92fc66 100644 --- a/blade-service/blade-file/src/main/java/org/springblade/file/service/impl/FileTaskServiceImpl.java +++ b/blade-service/blade-file/src/main/java/org/springblade/file/service/impl/FileTaskServiceImpl.java @@ -57,6 +57,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -127,6 +128,8 @@ public class FileTaskServiceImpl extends ServiceImpl i addParam.setUploadId(uploadId); // 正在上传 addParam.setStatus(FileTaskStatus.UPLOADING.getCode()); + // 文件任务创建即代表上传开始,显式记录时间,避免依赖自动填充导致上传时间为空。 + addParam.setCreateTime(new Date()); // 兼容历史表未配置 is_deleted 默认值的场景。 addParam.setIsDeleted(0); this.save(addParam); @@ -344,7 +347,8 @@ public class FileTaskServiceImpl extends ServiceImpl i .eq(StringUtil.isNotBlank(businessId), FileTask::getBusinessId, businessId) .like(StringUtil.isNotBlank(attachmentName), FileTask::getAttachmentName, attachmentName) .eq(StringUtil.isNotBlank(status), FileTask::getStatus, status) - .orderByDesc(FileTask::getCreateTime)); + .orderByDesc(FileTask::getCreateTime) + .orderByDesc(FileTask::getId)); return page.convert(this::getFileTaskUpdateVO); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java index 199bcfe..09396f5 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java @@ -615,7 +615,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl latestList = list(Wrappers.lambdaQuery() .select(LoadingManage::getLoadingNo) .likeRight(LoadingManage::getLoadingNo, prefix) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java index d7e5a88..3a15e5e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java @@ -455,5 +455,5 @@ public class MasterOrderServiceImpl extends BaseServiceImpl values, String key) { String value = string(values, key); if (Func.isEmpty(value)) return null; try { return LocalDate.parse(value.substring(0, 10)); } catch (Exception exception) { throw new ServiceException("日期格式不正确"); } } private String string(Map values, String key) { return string(values, key, null); } private String string(Map values, String key, String fallback) { Object value = values.get(key); return value == null ? fallback : String.valueOf(value); } - private synchronized String nextCode() { String prefix = "DL" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); long count = count(new LambdaQueryWrapper().likeRight(MasterOrder::getMasterNo, prefix)); return prefix + String.format("%04d", count + 1); } + private synchronized String nextCode() { String prefix = "DL-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-"; long count = count(new LambdaQueryWrapper().likeRight(MasterOrder::getMasterNo, prefix)); return prefix + String.format("%04d", count + 1); } } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java index a197175..2843a48 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java @@ -46,10 +46,12 @@ import org.springblade.transport.pojo.entity.TransportPlan; import org.springblade.transport.pojo.entity.Waybill; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.TransportPlanVO; +import org.springblade.transport.pojo.vo.WaybillVO; import org.springblade.transport.service.ITransportPlanService; import org.springblade.transport.service.IWaybillService; import org.springblade.transport.support.TransportBusinessSupport; import org.springblade.transport.wrapper.TransportPlanWrapper; +import org.springblade.transport.wrapper.WaybillWrapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -369,11 +371,12 @@ public class TransportPlanServiceImpl extends BaseServiceImpl plan.setDispatchRows(Collections.emptyList())); return; } - Map> waybillsByPlanId = waybillService.list(Wrappers.lambdaQuery() + Map> waybillsByPlanId = waybillService.list(Wrappers.lambdaQuery() .eq(Waybill::getIsDeleted, 0) .in(Waybill::getPlanId, planIds)) .stream() - .collect(Collectors.groupingBy(Waybill::getPlanId)); + .map(WaybillWrapper.build()::entityVO) + .collect(Collectors.groupingBy(WaybillVO::getPlanId)); plans.forEach(plan -> plan.setDispatchRows( waybillsByPlanId.getOrDefault(plan.getId(), Collections.emptyList()) )); @@ -522,7 +525,7 @@ public class TransportPlanServiceImpl extends BaseServiceImpl latestList = list(Wrappers.lambdaQuery() .select(TransportPlan::getPlanNo) .likeRight(TransportPlan::getPlanNo, prefix) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java index fad4d26..66fb490 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java @@ -816,7 +816,7 @@ public class WaybillServiceImpl extends BaseServiceImpl } private synchronized String nextCode() { - String prefix = "YD" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); + String prefix = "YD-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-"; List latestList = list(Wrappers.lambdaQuery() .select(Waybill::getWaybillNo) .likeRight(Waybill::getWaybillNo, prefix) diff --git a/doc/sql/bladex/blade_file_task_upload_time_upgrade_20260814.sql b/doc/sql/bladex/blade_file_task_upload_time_upgrade_20260814.sql new file mode 100644 index 0000000..8bb1703 --- /dev/null +++ b/doc/sql/bladex/blade_file_task_upload_time_upgrade_20260814.sql @@ -0,0 +1,6 @@ +-- 补齐历史文件上传任务的上传时间。 +-- 文件任务创建时间即上传开始时间;仅回填空值,不覆盖已有记录。 +UPDATE `blade_file_task` +SET `create_time` = `update_time` +WHERE `create_time` IS NULL + AND `update_time` IS NOT NULL;