java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stabilize smart loading plan reads

Browse Source
This commit is contained in:
ouyangxq
2026-09-04 14:28:25 +08:00
parent 2c94e212ca
commit 760c7b561d
4 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/mapper/SmartLoadingCandidateMapper.java
+15
View File
@@ -359,6 +359,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ba
Candidate candidate(@Param("planId") long planId,@Param("warehouseId") long warehouseId,
@Param("inboundId") long inboundId,@Param("detailId") long detailId);
@Select("""
SELECT SUM(i.package_count)
FROM fl_inbound_measurement m
JOIN fl_inbound_measurement_item i
ON i.tenant_id=m.tenant_id AND i.measurement_id=m.id
WHERE m.tenant_id=#{accountId} AND m.inbound_id=#{inboundId} AND m.status='APPROVED'
AND m.id=(SELECT MAX(m2.id) FROM fl_inbound_measurement m2
WHERE m2.tenant_id=m.tenant_id AND m2.inbound_id=m.inbound_id
AND m2.status='APPROVED')
AND i.inbound_detail_id=#{detailId} AND i.package_count>0
""")
Integer measuredPackageCount(@Param("accountId") long accountId,
@Param("inboundId") long inboundId,
@Param("detailId") long detailId);
@lombok.Getter @lombok.Setter class ChannelContainerCountRow {
private String channelCode;
private Long availableContainerCount;
firstleg/src/main/java/com/baiyue/firstleg/repository/SmartLoadingRepository.java
+3
View File
@@ -65,6 +65,9 @@ public class SmartLoadingRepository {
public Candidate candidate(long planId, long warehouseId, long inboundId, long detailId) {
return candidates.candidate(planId, warehouseId, inboundId, detailId);
}
public Integer measuredPackageCount(long accountId, long inboundId, long detailId) {
return candidates.measuredPackageCount(accountId, inboundId, detailId);
}
public InboundOrderEntity inbound(long accountId, long inboundId) {
return inbounds.selectOne(new LambdaQueryWrapper<InboundOrderEntity>()
.eq(InboundOrderEntity::getTenantId, accountId)
firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java
+14 -11
View File
@@ -1429,7 +1429,7 @@ public class SmartLoadingService {
int picked = task.pickedByPlanItem().getOrDefault(item.getId(), 0);
item.setPickedPackageCount(picked);
item.setMinPackageCount(Math.max(1, picked));
int total = adjustmentTotal(p.getId(), b.getWarehouseId(), item);
int total = adjustmentTotal(item);
item.setTotalPackageCount(total);
item.setRemainingPackageCount(Math.max(0, total - item.getPackageCount()));
item.setCanAdjust(mutable);
@@ -1441,18 +1441,21 @@ public class SmartLoadingService {
b.getContainerNo(),b.getVoyageNo(),p.getVersion(),mutable,mutable,blockedReason,finalStatus,
task.taskId(),task.taskStatus(),task.taskVersion(),planCoLoadGroups(p.getId()),items);
}
private int adjustmentTotal(long planId, long warehouseId, LoadingPlanItemEntity item) {
private int adjustmentTotal(LoadingPlanItemEntity item) {
int current = item.getPackageCount() == null ? 0 : item.getPackageCount();
Candidate measured = repository.candidate(planId, warehouseId, item.getInboundId(), item.getInboundDetailId());
if (measured != null) {
return current + Math.max(0, measured.availablePackageCount() == null
? 0 : measured.availablePackageCount());
}
InboundOrderEntity inbound = repository.inbound(item.getAccountId(), item.getInboundId());
if (inbound == null || !Set.of("PREPARING", "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING",
"MEASURE_REJECTED", "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING")
.contains(inbound.getProcessStatus())) return current;
try {
if (item.getAccountId() == null || item.getInboundId() == null
|| item.getInboundDetailId() == null) return current;
InboundOrderEntity inbound = repository.inbound(item.getAccountId(), item.getInboundId());
if (inbound == null) return current;
if (Set.of("WAIT_SPLIT", "LOADING").contains(inbound.getProcessStatus())) {
Integer measured = repository.measuredPackageCount(item.getAccountId(), item.getInboundId(),
item.getInboundDetailId());
return Math.max(current, measured == null ? 0 : measured);
}
if (!Set.of("PREPARING", "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING",
"MEASURE_REJECTED", "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING")
.contains(inbound.getProcessStatus()) || item.getOrderId() == null) return current;
OrderCargoClient.CargoBinding cargo = loadCargo(item.getAccountId(), item.getOrderId(), item.getInboundDetailId());
return Math.max(current, cargo.originalPackageCount() == null ? 0 : cargo.originalPackageCount());
} catch (RuntimeException ignored) {