This commit is contained in:
2026-08-28 10:03:32 +08:00
parent dd117b8fc2
commit a6f266687e
13 changed files with 147 additions and 16 deletions
@@ -12,7 +12,7 @@ public final class InventoryCommandRequests {
public record StockIn(
String customerId,
String customerName,
@NotBlank @Size(max = 255) String customerName,
@NotBlank String overseasWarehouseId,
String overseasWarehouseCode,
String overseasWarehouseName,
@@ -39,7 +39,7 @@ public final class InventoryCommandRequests {
}
public record InTransit(
String customerName,
@NotBlank @Size(max = 255) String customerName,
@NotBlank String overseasWarehouseId,
String overseasWarehouseCode,
String overseasWarehouseName,
@@ -232,6 +232,7 @@ public class InventoryCommandService {
String destinationWarehouseName, Long inboundOrderId, String inboundOrderNo,
String inboundCode, String requestedSkuCode, String productNameZh,
String productNameEn) {
String frozenCustomerName = required(customerName, "Customer name snapshot is required");
String skuCode = sku(requestedSkuCode);
String destinationId = trim(destinationWarehouseId);
String destinationCode = trim(destinationWarehouseCode);
@@ -242,13 +243,14 @@ public class InventoryCommandService {
InventoryBalance balance = balances.lockDimension(customerId, overseasWarehouseId,
destinationCode, inboundOrderId, inboundCode);
if (balance != null) {
requireCustomerSnapshot(balance, frozenCustomerName);
mergeSkuSnapshot(balance, skuCode);
return balance;
}
balance = new InventoryBalance();
balance.setId(IdWorker.getId());
balance.setCustomerId(customerId);
balance.setCustomerName(trim(customerName));
balance.setCustomerName(frozenCustomerName);
balance.setOverseasWarehouseId(overseasWarehouseId.trim());
balance.setOverseasWarehouseCode(trim(overseasWarehouseCode));
balance.setOverseasWarehouseName(trim(overseasWarehouseName));
@@ -272,6 +274,7 @@ public class InventoryCommandService {
InventoryBalance concurrent = balances.lockDimension(customerId, overseasWarehouseId,
destinationCode, inboundOrderId, inboundCode);
if (concurrent != null) {
requireCustomerSnapshot(concurrent, frozenCustomerName);
mergeSkuSnapshot(concurrent, skuCode);
return concurrent;
}
@@ -384,6 +387,7 @@ public class InventoryCommandService {
InventoryLedger ledger = new InventoryLedger();
ledger.setId(IdWorker.getId());
ledger.setCustomerId(customerId);
ledger.setCustomerName(balance.getCustomerName());
ledger.setBalanceId(balance.getId());
ledger.setPositionId(position == null ? null : position.getId());
ledger.setOverseasWarehouseId(balance.getOverseasWarehouseId());
@@ -515,6 +519,16 @@ public class InventoryCommandService {
if (actual < requested) throw conflict("Insufficient " + field + " packages");
}
private static void requireCustomerSnapshot(InventoryBalance balance, String requestedCustomerName) {
String frozenCustomerName = trim(balance.getCustomerName());
if (frozenCustomerName == null) {
throw conflict("Inventory balance customer name snapshot is missing");
}
if (!frozenCustomerName.equals(requestedCustomerName)) {
throw conflict("Inventory balance customer name snapshot does not match");
}
}
private static String required(String value, String message) {
String normalized = trim(value);
if (normalized == null) throw badRequest(message);
@@ -15,6 +15,7 @@ public class InventoryLedger {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private String customerId;
private String customerName;
private Long balanceId;
private Long positionId;
private String overseasWarehouseId;
@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
public record InventoryLedgerView(
Long id,
String customerId,
String customerName,
String overseasWarehouseId,
String destinationWarehouseCode,
Long inboundOrderId,
@@ -97,11 +97,11 @@ public class InventoryQueryService {
public byte[] exportLedgers(String customerId, InventoryQueryRequests.LedgerQuery query) {
validateDateRange(query);
List<String> rows = new ArrayList<>();
rows.add("occurredAt,customerId,overseasWarehouseId,destinationWarehouseCode,inboundOrderId,inboundOrderNo," +
rows.add("occurredAt,customerId,customerName,overseasWarehouseId,destinationWarehouseCode,inboundOrderId,inboundOrderNo," +
"inboundCode,businessType,businessOrderNo,outboundOrderNo,palletNo,batchNo,statusFrom,statusTo," +
"beforePackages,deltaPackages,afterPackages,operatorId,remark");
mapper.ledgers(customerId, query, 0, EXPORT_LIMIT).stream().map(this::ledgerView).forEach(v -> rows.add(
String.join(",", csv(v.occurredAt()), csv(v.customerId()), csv(v.overseasWarehouseId()),
String.join(",", csv(v.occurredAt()), csv(v.customerId()), csv(v.customerName()), csv(v.overseasWarehouseId()),
csv(v.destinationWarehouseCode()), csv(v.inboundOrderId()), csv(v.inboundOrderNo()), csv(v.inboundCode()),
csv(v.businessType()), csv(v.businessOrderNo()), csv(v.outboundOrderNo()), csv(v.palletNo()), csv(v.batchNo()),
csv(v.statusFrom()), csv(v.statusTo()), csv(v.beforePackages()), csv(v.deltaPackages()),
@@ -144,7 +144,7 @@ public class InventoryQueryService {
}
private InventoryLedgerView ledgerView(InventoryLedger value) {
return new InventoryLedgerView(value.getId(), value.getCustomerId(), value.getOverseasWarehouseId(),
return new InventoryLedgerView(value.getId(), value.getCustomerId(), value.getCustomerName(), value.getOverseasWarehouseId(),
value.getDestinationWarehouseCode(), value.getInboundOrderId(), value.getInboundOrderNo(), value.getInboundCode(),
value.getPalletNo(), value.getBatchNo(),
value.getWarehouseLocationCode(), value.getSkuCode(), value.getBusinessType(), value.getBusinessOrderNo(),