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

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>
 
 

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java

@@ -118,5 +118,9 @@ public class PickingOrder extends BaseVOEntity {
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 
-}
+
+}

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java

@@ -146,6 +146,7 @@ public class PickingOrderPO extends StockOutOrderBasePO {
     @Excel(name = "优先级别名称")
     private String priorityLevelName;
 
-
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
-
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
-}
+    private Integer gwPushStatus;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java

@@ -192,4 +192,8 @@ public class PickingOrderDO extends BaseVOEntity {
     @ApiModelProperty("优先级别名称")
     @Excel(name = "优先级别名称")
     private String priorityLevelName;
-}
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java

@@ -101,5 +101,9 @@ public class StockShelfOrder extends BaseVOEntity {
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
 
-}
+
+}

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java

@@ -122,4 +122,8 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
     @Excel(name = "总面积(SQM)")
     private BigDecimal totalArea;
 
-}
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+
+}

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java

@@ -134,4 +134,8 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
 
     @ApiModelProperty(name = "创建时间查询条件结束日期")
     private String createTimeEnd;
-}
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java

@@ -160,4 +160,8 @@ public class PickingOrderDTO extends BaseVOEntity {
 
     @ApiModelProperty("拣货单id集合")
     private List<Long> pickingOrderIdList;
-}
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+}

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java

@@ -123,4 +123,8 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty(name = "创建时间查询条件结束日期")
     private String createTimeEnd;
-}
+
+    @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+    @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+    private Integer gwPushStatus;
+}

mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderTypeName"    column="order_type_name"    />
         <result property="priorityLevelCode"    column="priority_level_code"    />
         <result property="priorityLevelName"    column="priority_level_name"    />
+        <result property="gwPushStatus"    column="GW_PUSH_STATUS"    />
     </resultMap>
 
 
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.status, a.type, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.quantity, a.weight_limit, a.volume_limit, a.material_quantity,
         IFNULL((SELECT SUM(b.picking_quantity) FROM picking_material_detail b WHERE b.picking_order_number = a.picking_order_number AND b.del_flag = 1), 0) AS picking_quantity,
         a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time,
-        a.update_by, a.update_by_name, a.del_flag,a.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name
+        a.update_by, a.update_by_name, a.del_flag,a.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name,a.gw_push_status
     </sql>
 
     <sql id="selectPickingOrderPo1">

mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateByName"    column="update_by_name"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="gwPushStatus"    column="GW_PUSH_STATUS"    />
     </resultMap>
 
 
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.shelf_order_id, a.organization_id, a.organization_name, a.top_organization_id,
         a.in_order_number, a.receipt_order_number,a.receipt_task_number, a.shelf_order_number,a.status, a.receipt_quantity, a.shelves_quantity, a.material_quantity,
         a.shelves_material_quantity, a.abnormal,a.task_distribution, a.task_distribution_time, a.operators_by, a.remark, a.create_time, a.create_by,
-        a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag
+        a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,a.gw_push_status
     </sql>
 
     <sql id="selectStockShelfOrderPo1">