From 9fcacbf9aff1823bb37e162dfbabb960292dd5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 18 May 2026 11:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E7=B3=BB=E7=BB=9F=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=85=B3=E5=8A=A1=E6=8E=A8=E9=80=81=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/ReservationStockInOrder.java | 4 ++++
.../repository/po/ReservationStockInOrderPO.java | 4 ++++
.../repository/todo/ReservationStockInOrderDO.java | 4 ++++
.../repository/todo/ReservationStockInOrderDTO.java | 4 ++++
.../entity/ReservationStockOutOrder.java | 4 ++++
.../repository/po/ReservationStockOutOrderPO.java | 4 ++++
.../repository/todo/ReservationStockOutOrderDO.java | 4 ++++
.../repository/todo/ReservationStockOutOrderDTO.java | 4 ++++
.../ReservationStockInOrderMapper.xml | 3 ++-
.../ReservationStockOutOrderMapper.xml | 3 ++-
.../mhd/wms/domain/pickingOrder/entity/PickingOrder.java | 6 +++++-
.../domain/pickingOrder/repository/po/PickingOrderPO.java | 7 ++++---
.../pickingOrder/repository/todo/PickingOrderDO.java | 6 +++++-
.../wms/domain/stockShelfOrder/entity/StockShelfOrder.java | 6 +++++-
.../stockShelfOrder/repository/po/StockShelfOrderPO.java | 6 +++++-
.../stockShelfOrder/repository/todo/StockShelfOrderDO.java | 6 +++++-
.../wms/interfaces/dto/pickingOrder/PickingOrderDTO.java | 6 +++++-
.../interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java | 6 +++++-
.../resources/mapper/pickingOrder/PickingOrderMapper.xml | 3 ++-
.../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 3 ++-
20 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java
index e14ece158..dabc914d4 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java
+++ b/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;
+
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
index 2cd9e2228..08667f83d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java
+++ b/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;
+
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
index a54360ff5..a56d88ca0 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
index dff5e4837..ab0b45370 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java
index fd371f884..15c6deeb7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java
+++ b/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;
+
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
index 0afa844b3..c7fb389b9 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
index 800cc98ec..c32a6bbad 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
index 81cd059aa..25319a14a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+++ b/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;
}
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 6b4d3243b..5887e0b67 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -93,6 +93,7 @@
+
@@ -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
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index ba129dc04..9bef44b18 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -95,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -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
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java
index 75edfa675..f1126002b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java
+++ b/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;
-}
+
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
index a6a317102..1b20fe39f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java
+++ b/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;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
index 6d69bc094..2782e9d43 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java
+++ b/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;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java
index e4529924a..c024f274c 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/entity/StockShelfOrder.java
+++ b/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;
-}
+
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
index 4d1b8910c..5fe441ae6 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/po/StockShelfOrderPO.java
+++ b/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;
+
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
index 537016f38..9766a13f0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java
+++ b/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;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
index 243a31a9c..13a4abb9a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java
+++ b/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 pickingOrderIdList;
-}
+
+ @ApiModelProperty("推送关务状态: 1-已推送 0-未推送")
+ @Excel(name = "推送关务状态: 1-已推送 0-未推送")
+ private Integer gwPushStatus;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
index c86f5821f..ffc5404f4 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java
+++ b/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;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
index 470bfba95..ef5286648 100644
--- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -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
diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
index 3c57d6b8f..82c558b28 100644
--- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -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