一件代发拣货

firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java

@@ -63,7 +63,12 @@ public interface OrderCargoClient {
     }
 
     record CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
-                             Integer packageCount, BigDecimal lengthCm, BigDecimal widthCm,
+                             String skuNo, Integer packageCount, BigDecimal lengthCm, BigDecimal widthCm,
                              BigDecimal heightCm) {
+        public CargoLabelBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
+                                 Integer packageCount, BigDecimal lengthCm, BigDecimal widthCm,
+                                 BigDecimal heightCm) {
+            this(cargoId, orderId, itemNo, cargoName, null, packageCount, lengthCm, widthCm, heightCm);
+        }
     }
 }

firstleg/src/main/java/com/baiyue/firstleg/entity/InboundCartonLabelEntity.java

@@ -22,6 +22,7 @@ public class InboundCartonLabelEntity {
     private Long inboundDetailId;
     private Integer cargoItemNo;
     private String cargoName;
+    private String skuCode;
     private Integer detailPackageCount;
     private String inboundCode;
     private String boxCode;

firstleg/src/main/java/com/baiyue/firstleg/repository/InboundCartonLabelRepository.java

@@ -62,6 +62,16 @@ public class InboundCartonLabelRepository {
             .set(InboundCartonLabelEntity::getCargoFingerprint, fingerprint));
     }
 
+    public void initializeLegacySku(long tenantId, long inboundId, long inboundDetailId, String skuCode) {
+        if (skuCode == null || skuCode.isBlank()) return;
+        labels.update(null, new LambdaUpdateWrapper<InboundCartonLabelEntity>()
+            .eq(InboundCartonLabelEntity::getTenantId, tenantId)
+            .eq(InboundCartonLabelEntity::getInboundId, inboundId)
+            .eq(InboundCartonLabelEntity::getInboundDetailId, inboundDetailId)
+            .isNull(InboundCartonLabelEntity::getSkuCode)
+            .set(InboundCartonLabelEntity::getSkuCode, skuCode.trim()));
+    }
+
     public boolean initializeOriginalPackageCount(long tenantId, long inboundId, int packageCount) {
         return inbounds.update(null, new LambdaUpdateWrapper<InboundOrderEntity>()
             .eq(InboundOrderEntity::getTenantId, tenantId)

firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelService.java

@@ -50,6 +50,14 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
             throw new BizException(ResultCode.CONFLICT, "当前入库单状态不允许首次生成箱号");
         }
         List<OrderCargoClient.CargoLabelBinding> cargoes = loadCargoes(inbound);
+        if ("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType())
+            && cargoes.stream().anyMatch(cargo -> cargo.skuNo() == null || cargo.skuNo().isBlank())) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "一件代发货物明细缺少SKU，不能生成箱唛");
+        }
+        existing.forEach(label -> cargoes.stream()
+            .filter(cargo -> java.util.Objects.equals(cargo.cargoId(), label.getInboundDetailId()))
+            .findFirst().ifPresent(cargo -> repository.initializeLegacySku(tenantId, inboundId,
+                label.getInboundDetailId(), cargo.skuNo())));
         String fingerprint = fingerprint(cargoes);
         if (!existing.isEmpty()) {
             String existingFingerprint = consistent.get(0).getCargoFingerprint();
@@ -202,6 +210,7 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
         label.setInboundDetailId(cargo.cargoId());
         label.setCargoItemNo(cargo.itemNo());
         label.setCargoName(cargo.cargoName());
+        label.setSkuCode(cargo.skuNo());
         label.setDetailPackageCount(cargo.packageCount());
         label.setInboundCode(inbound.getInboundCode());
         label.setBoxCode(inbound.getInboundCode() + "#" + total + "-" + index);
@@ -256,7 +265,8 @@ public class InboundCartonLabelService implements CartonLabelBindingResolver {
 
     private String fingerprint(List<OrderCargoClient.CargoLabelBinding> cargoes) {
         String source = cargoes.stream().map(cargo -> String.join("|", String.valueOf(cargo.itemNo()),
-            cargo.cargoName() == null ? "" : cargo.cargoName().trim(), String.valueOf(cargo.packageCount()),
+            cargo.cargoName() == null ? "" : cargo.cargoName().trim(),
+            cargo.skuNo() == null ? "" : cargo.skuNo().trim(), String.valueOf(cargo.packageCount()),
             decimalOrEmpty(cargo.lengthCm()), decimalOrEmpty(cargo.widthCm()), decimalOrEmpty(cargo.heightCm())))
             .collect(java.util.stream.Collectors.joining("\n"));
         try {