From 9d7cb802855505c05c580ba37ce0d473923734d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Tue, 9 Jun 2026 10:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDocumentOrder/entity/BusinessDocumentOrder.java | 3 +++ .../repository/po/BusinessDocumentOrderPO.java | 3 +++ .../repository/todo/BusinessDocumentOrderDO.java | 3 +++ .../oms/domain/executeOrder/repository/po/ExecuteOrderPO.java | 3 +++ .../domain/executeOrder/repository/todo/ExecuteOrderDO.java | 3 +++ .../dto/businessDocumentOrder/BusinessDocumentOrderDTO.java | 3 +++ .../mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java | 3 +++ .../main/resources/mapper/executeOrder/ExecuteOrderMapper.xml | 3 ++- 8 files changed, 23 insertions(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java index d1a90eac0..db9e3ac99 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java @@ -804,4 +804,7 @@ public class BusinessDocumentOrder extends BaseVOEntity{ @ApiModelProperty("配送进度") private String deliveryProgress; + + @ApiModelProperty("车次") + private Integer trainNo; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java index 241f1859f..584308d15 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java @@ -829,4 +829,7 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{ @ApiModelProperty("子单完成数量") private Integer tmsOrderStatusCount; + @ApiModelProperty("车次") + private Integer trainNo; + } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java index 0924ec96f..966d9ba67 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java @@ -871,4 +871,7 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{ @ApiModelProperty("配送进度") private String deliveryProgress; + @ApiModelProperty("车次") + private Integer trainNo; + } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java index 4cdc4e139..cb723b526 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java @@ -231,4 +231,7 @@ public class ExecuteOrderPO extends BaseVOEntity{ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date invoiceDate; + @ApiModelProperty("车次") + private Integer trainNo; + } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java index 358f10713..13a5adf17 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java @@ -169,4 +169,7 @@ public class ExecuteOrderDO extends BaseVOEntity{ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date invoiceEndTime; + + @ApiModelProperty("车次") + private Integer trainNo; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java index 3b4f52781..d77699e21 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java @@ -887,4 +887,7 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{ @ApiModelProperty("配送进度") private String deliveryProgress; + + @ApiModelProperty("车次") + private Integer trainNo; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java index f3d86b6a6..89f2e31f6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java @@ -156,4 +156,7 @@ public class ExecuteOrderDTO extends BaseVOEntity{ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date invoiceEndTime; + @ApiModelProperty("车次") + private Integer trainNo; + } diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml index 44603eeb8..f592f741e 100644 --- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml @@ -28,7 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT eo.*, bdo.main_order_num, - bdo.RECIPIENT_NAME + bdo.RECIPIENT_NAME, + bdo.train_no FROM execute_order eo LEFT JOIN