b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-14 14:45:39 +08:00
parent 2373d62ceb
commit 1ca36ae153
7 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportPlanVO.java
+1 -2
View File
@@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springblade.transport.pojo.entity.TransportPlan; import org.springblade.transport.pojo.entity.TransportPlan;
import org.springblade.transport.pojo.entity.Waybill;
import java.io.Serial; import java.io.Serial;
import java.util.List; import java.util.List;
@@ -66,7 +65,7 @@ public class TransportPlanVO extends TransportPlan {
@TableField(exist = false) @TableField(exist = false)
@Schema(description = "计划调度生成的运单") @Schema(description = "计划调度生成的运单")
private List<Waybill> dispatchRows; private List<WaybillVO> dispatchRows;
} }
blade-service/blade-file/src/main/java/org/springblade/file/service/impl/FileTaskServiceImpl.java
+5 -1
View File
@@ -57,6 +57,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@@ -127,6 +128,8 @@ public class FileTaskServiceImpl extends ServiceImpl<FileTaskMapper, FileTask> i
addParam.setUploadId(uploadId); addParam.setUploadId(uploadId);
// 正在上传 // 正在上传
addParam.setStatus(FileTaskStatus.UPLOADING.getCode()); addParam.setStatus(FileTaskStatus.UPLOADING.getCode());
// 文件任务创建即代表上传开始，显式记录时间，避免依赖自动填充导致上传时间为空。
addParam.setCreateTime(new Date());
// 兼容历史表未配置 is_deleted 默认值的场景。 // 兼容历史表未配置 is_deleted 默认值的场景。
addParam.setIsDeleted(0); addParam.setIsDeleted(0);
this.save(addParam); this.save(addParam);
@@ -344,7 +347,8 @@ public class FileTaskServiceImpl extends ServiceImpl<FileTaskMapper, FileTask> i
.eq(StringUtil.isNotBlank(businessId), FileTask::getBusinessId, businessId) .eq(StringUtil.isNotBlank(businessId), FileTask::getBusinessId, businessId)
.like(StringUtil.isNotBlank(attachmentName), FileTask::getAttachmentName, attachmentName) .like(StringUtil.isNotBlank(attachmentName), FileTask::getAttachmentName, attachmentName)
.eq(StringUtil.isNotBlank(status), FileTask::getStatus, status) .eq(StringUtil.isNotBlank(status), FileTask::getStatus, status)
.orderByDesc(FileTask::getCreateTime)); .orderByDesc(FileTask::getCreateTime)
.orderByDesc(FileTask::getId));
return page.convert(this::getFileTaskUpdateVO); return page.convert(this::getFileTaskUpdateVO);
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
+1 -1
View File
@@ -615,7 +615,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
} }
private synchronized String nextCode() { private synchronized String nextCode() {
String prefix = "PZ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-"; String prefix = "PZ-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
List<LoadingManage> latestList = list(Wrappers.<LoadingManage>lambdaQuery() List<LoadingManage> latestList = list(Wrappers.<LoadingManage>lambdaQuery()
.select(LoadingManage::getLoadingNo) .select(LoadingManage::getLoadingNo)
.likeRight(LoadingManage::getLoadingNo, prefix) .likeRight(LoadingManage::getLoadingNo, prefix)
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java
+1 -1
View File
@@ -455,5 +455,5 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
private LocalDate date(Map<String, Object> 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 LocalDate date(Map<String, Object> 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<String, Object> values, String key) { return string(values, key, null); } private String string(Map<String, Object> values, String key) { return string(values, key, null); }
private String string(Map<String, Object> values, String key, String fallback) { Object value = values.get(key); return value == null ? fallback : String.valueOf(value); } private String string(Map<String, Object> 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<MasterOrder>().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<MasterOrder>().likeRight(MasterOrder::getMasterNo, prefix)); return prefix + String.format("%04d", count + 1); }
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
+6 -3
View File
@@ -46,10 +46,12 @@ import org.springblade.transport.pojo.entity.TransportPlan;
import org.springblade.transport.pojo.entity.Waybill; import org.springblade.transport.pojo.entity.Waybill;
import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
import org.springblade.transport.pojo.vo.TransportPlanVO; 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.ITransportPlanService;
import org.springblade.transport.service.IWaybillService; import org.springblade.transport.service.IWaybillService;
import org.springblade.transport.support.TransportBusinessSupport; import org.springblade.transport.support.TransportBusinessSupport;
import org.springblade.transport.wrapper.TransportPlanWrapper; import org.springblade.transport.wrapper.TransportPlanWrapper;
import org.springblade.transport.wrapper.WaybillWrapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -369,11 +371,12 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
plans.forEach(plan -> plan.setDispatchRows(Collections.emptyList())); plans.forEach(plan -> plan.setDispatchRows(Collections.emptyList()));
return; return;
} }
Map<Long, List<Waybill>> waybillsByPlanId = waybillService.list(Wrappers.<Waybill>lambdaQuery() Map<Long, List<WaybillVO>> waybillsByPlanId = waybillService.list(Wrappers.<Waybill>lambdaQuery()
.eq(Waybill::getIsDeleted, 0) .eq(Waybill::getIsDeleted, 0)
.in(Waybill::getPlanId, planIds)) .in(Waybill::getPlanId, planIds))
.stream() .stream()
.collect(Collectors.groupingBy(Waybill::getPlanId)); .map(WaybillWrapper.build()::entityVO)
.collect(Collectors.groupingBy(WaybillVO::getPlanId));
plans.forEach(plan -> plan.setDispatchRows( plans.forEach(plan -> plan.setDispatchRows(
waybillsByPlanId.getOrDefault(plan.getId(), Collections.emptyList()) waybillsByPlanId.getOrDefault(plan.getId(), Collections.emptyList())
)); ));
@@ -522,7 +525,7 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
} }
private synchronized String nextCode() { private synchronized String nextCode() {
String prefix = "JH-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); String prefix = "JH-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
List<TransportPlan> latestList = list(Wrappers.<TransportPlan>lambdaQuery() List<TransportPlan> latestList = list(Wrappers.<TransportPlan>lambdaQuery()
.select(TransportPlan::getPlanNo) .select(TransportPlan::getPlanNo)
.likeRight(TransportPlan::getPlanNo, prefix) .likeRight(TransportPlan::getPlanNo, prefix)
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
+1 -1
View File
@@ -816,7 +816,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
} }
private synchronized String nextCode() { 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<Waybill> latestList = list(Wrappers.<Waybill>lambdaQuery() List<Waybill> latestList = list(Wrappers.<Waybill>lambdaQuery()
.select(Waybill::getWaybillNo) .select(Waybill::getWaybillNo)
.likeRight(Waybill::getWaybillNo, prefix) .likeRight(Waybill::getWaybillNo, prefix)
doc/sql/bladex/blade_file_task_upload_time_upgrade_20260814.sql
+6
View File
@@ -0,0 +1,6 @@
-- 补齐历史文件上传任务的上传时间。
-- 文件任务创建时间即上传开始时间；仅回填空值，不覆盖已有记录。
UPDATE `blade_file_task`
SET `create_time` = `update_time`
WHERE `create_time` IS NULL
AND `update_time` IS NOT NULL;