车次添加

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;
 }

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;
+
 }

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;
+
 }

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;
+
 }

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;
 }

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;
 }

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;
+
 }

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