关务系统添加关务推送状态字段;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java

@@ -409,4 +409,8 @@ public class ReservationStockInOrder extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
 
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -432,4 +432,8 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
 
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -430,4 +430,8 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java

@@ -428,4 +428,8 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date storageTime;
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -444,4 +444,8 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
 
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -454,4 +454,8 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -490,4 +490,8 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -479,4 +479,8 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 }

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -93,6 +93,7 @@
         <result property="directorName"    column="DIRECTOR_NAME"    />
         <result property="storageTime"    column="STORAGE_TIME"    />
         <result property="inQuantity"    column="IN_QUANTITY"    />
+        <result property="gwPushStatus"    column="GW_PUSH_STATUS"    />
     </resultMap>
 
 
@@ -128,7 +129,7 @@
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
         a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
-        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity
+        ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity,a.gw_push_status
     </sql>
 
     <sql id="joinStockInOrderPo">

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservationOrderSource"    column="RESERVATION_ORDER_SOURCE"    />
         <result property="outboundTime"    column="OUTBOUND_TIME"    />
         <result property="businessOrderNo"    column="BUSINESS_ORDER_NO"    />
+        <result property="gwPushStatus"    column="GW_PUSH_STATUS"    />
     </resultMap>
 
 
@@ -112,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
-        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
+        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.gw_push_status
     </sql>