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/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() {
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()
.select(LoadingManage::getLoadingNo)
.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 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 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.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<TransportPlanMappe
plans.forEach(plan -> plan.setDispatchRows(Collections.emptyList()));
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)
.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<TransportPlanMappe
}
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()
.select(TransportPlan::getPlanNo)
.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() {
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()
.select(Waybill::getWaybillNo)
.likeRight(Waybill::getWaybillNo, prefix)