修改提交

lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java

@@ -12,6 +12,7 @@ import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
 import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
+import com.baiyue.lastleg.model.LastlegOrderType;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -106,7 +107,8 @@ public class LastlegOrderService {
         lines.add("ID,尾程单号,订单类型,入仓码,头程单号,货主,海外仓,转仓,转仓编码,FBA仓库,集装箱号,货柜状态,是否异常,是否暂扣,托数,箱数,体积(m3),数量,体积重量,预计到港时间,实际到港时间,预计到仓,入库单号,换标单号,换标状态,合托标记,主流程状态,子单状态,备注(仅自己),备注(客户),备注(仓库)");
         for (LastlegOrder order : orders) {
             lines.add(String.join(",", List.of(
-                csv(order.getId()), csv(order.getOrderNo()), csv(order.getOrderType()), csv(order.getInboundCode()),
+                csv(order.getId()), csv(order.getOrderNo()), csv(LastlegOrderType.labelOf(order.getOrderType())),
+                csv(order.getInboundCode()),
                 csv(order.getSourceOrderNo()), csv(order.getCustomerName()), csv(order.getOverseasWarehouseName()),
                 csv(order.getTransferWarehouseName()), csv(order.getTransferWarehouseCode()), csv(order.getFbaWarehouseCode()),
                 csv(order.getContainerNo()), csv(order.getContainerStatus()), csv(order.getAbnormal()), csv(order.getDetained()),
@@ -161,7 +163,8 @@ public class LastlegOrderService {
     }
 
     private LastlegOrderSummary summary(LastlegOrder o) {
-        return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(), o.getSourceInboundId(),
+        return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(),
+            LastlegOrderType.labelOf(o.getOrderType()), o.getSourceInboundId(),
             o.getInboundCode(), o.getSourceOrderNo(), o.getCustomerId(), o.getCustomerName(), o.getOverseasWarehouseId(),
             o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
             o.getTransferWarehouseName(), o.getFbaWarehouseCode(), o.getContainerNo(), o.getContainerStatus(),

lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java

@@ -31,6 +31,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 public class LoadingCompletedConsumer {
     @Resource private LastlegEventInboxMapper inboxMapper;
     @Resource private LastlegOrderMapper orderMapper;
+    @Resource private LastlegInboundOrderMapper inboundOrderMapper;
     @Resource private LastlegOrderDetailMapper detailMapper;
     @Resource private LastlegOrderStatusHistoryMapper historyMapper;
     @Resource private InboundPlanCartonMapper cartonMapper;
@@ -173,9 +174,11 @@ public class LoadingCompletedConsumer {
             if (raced != null && Objects.equals(raced.getSourcePayloadHash(), orderHash)) return;
             throw exception;
         }
+        createInboundOrderSnapshot(event, payload, source, order, orderHash);
 
         for(var item:source.items()) {
             LastlegOrderDetail detail=new LastlegOrderDetail();
+            detail.setCustomerId(customerId);
             detail.setOrderId(order.getId()); detail.setSourceInboundDetailId(item.sourceInboundDetailId()); detail.setSkuCode(item.skuCode());
             detail.setProductNameZh(item.productNameZh()); detail.setProductNameEn(item.productNameEn()); detail.setPackageCount(item.packageCount());
             detail.setProductQuantity(item.productQuantity()); detail.setPalletCount(item.palletCount()); detail.setGrossWeightKg(item.grossWeightKg());
@@ -185,7 +188,7 @@ public class LoadingCompletedConsumer {
             detail.setShipmentNo(item.shipmentNo()); detail.setShippingMark(item.shippingMark()); detailMapper.insert(detail);
             createCartonLabels(customerId, order.getId(), item);
         }
-        LastlegOrderStatusHistory history=new LastlegOrderStatusHistory();
+        LastlegOrderStatusHistory history=new LastlegOrderStatusHistory(); history.setCustomerId(customerId);
         history.setOrderId(order.getId()); history.setToStatus("PENDING_ASSIGNMENT"); history.setEventId(event.eventId());
         history.setRemark("头程装柜完成自动生成"); history.setCreatedAt(LocalDateTime.now()); historyMapper.insert(history);
         if ("FIRST_LEG".equals(orderType)) {
@@ -201,6 +204,28 @@ public class LoadingCompletedConsumer {
         }
     }
 
+    private void createInboundOrderSnapshot(EventEnvelope event, FirstLegLoadingPlanCompletedV1 payload,
+                                            FirstLegLoadingPlanCompletedV1.Order source, LastlegOrder order,
+                                            String orderHash) {
+        LastlegInboundOrder snapshot = new LastlegInboundOrder();
+        snapshot.setId(order.getId()); snapshot.setTenantId("BAIYUE");
+        snapshot.setCustomerId(order.getCustomerId()); snapshot.setSourceRegion(event.sourceRegion().name());
+        snapshot.setSourceInboundId(source.sourceInboundId()); snapshot.setRootInboundId(source.rootInboundId());
+        snapshot.setSourceOrderId(source.sourceOrderId()); snapshot.setSourceOrderNo(source.sourceOrderNo());
+        snapshot.setRootOrderId(source.rootOrderId()); snapshot.setInboundCode(source.inboundCode());
+        snapshot.setDestinationWarehouseId(source.destinationWarehouseId());
+        snapshot.setDestinationWarehouseCode(source.destinationWarehouseCode());
+        snapshot.setDestinationWarehouseName(source.destinationWarehouseName());
+        snapshot.setPackageCount(source.packageCount()); snapshot.setProductQuantity(source.productQuantity());
+        snapshot.setPalletCount(source.palletCount()); snapshot.setGrossWeightKg(source.grossWeightKg());
+        snapshot.setNetWeightKg(source.netWeightKg()); snapshot.setVolumeCbm(source.volumeCbm());
+        snapshot.setSourceEventId(event.eventId()); snapshot.setSourceLoadingPlanId(payload.loadingPlanId());
+        snapshot.setSourceLoadingPlanVersion(event.aggregateVersion()); snapshot.setHandoverVersion(event.handoverVersion());
+        snapshot.setPayloadHash(orderHash); snapshot.setStatus("READY"); snapshot.setExceptionFlag("NONE");
+        snapshot.setCreatedAt(order.getCreatedAt()); snapshot.setUpdatedAt(order.getUpdatedAt());
+        inboundOrderMapper.insert(snapshot);
+    }
+
     private void registerInTransit(EventEnvelope event, FirstLegLoadingPlanCompletedV1 payload,
                                    FirstLegLoadingPlanCompletedV1.Order source, LastlegOrder order,
                                    String inboundOrderNo) {