完成时间字段查询 推送字段查询

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

@@ -102,6 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="returnOrderNumber"    column="RETURN_ORDER_NUMBER"    />
         <result property="totalAmount"    column="TOTAL_AMOUNT"    />
         <result property="route"    column="ROUTE"    />
+        <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="pushStatus"    column="PUSH_STATUS"    />
+        <result property="pushBy"    column="PUSH_BY"    />
+        <result property="pushByName"    column="PUSH_BY_NAME"    />
     </resultMap>
 
 
@@ -120,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.RETURN_QUANTITY,a.DELIVERY_NAME,a.CUSTOMER_NUMBER,a.INVOICE_NUMBER,a.RETURN_ORDER_NUMBER,a.TOTAL_AMOUNT,
-        a.ROUTE
+        a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME
     </sql>
 
 

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

@@ -142,4 +142,10 @@ public class StockShelfOrderPO extends StockInOrderBasePO {
 
     @ApiModelProperty("是否报关")
     private Long needCustomsDeclaration;
+
+    @ApiModelProperty("完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date completionTime;
 }

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

@@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="priorityLevelCode"    column="priority_level_code"    />
         <result property="priorityLevelName"    column="priority_level_name"    />
         <result property="needDeclareFlag"    column="need_declare_flag"    />
+        <result property="pushStatus"    column="push_status"    />
+        <result property="pushTime"    column="push_time"    />
+        <result property="pushBy"    column="push_by"    />
+        <result property="pushByName"    column="push_by_name"    />
     </resultMap>
 
 
@@ -42,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.push_status,a.push_time,a.push_by,a.push_by_name
     </sql>
 
     <sql id="selectPickingOrderPo1">

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ,b.notice_number, b.warehouse_id, b.warehouse_code, b.warehouse_name, b.shipper_id, b.shipper_code, b.shipper_name,
         b.order_type_code, b.order_type_name, b.supplier_id, b.supplier_code, b.supplier_name, b.expect_time, b.supply_chain_number, b.priority_level_code,
         b.priority_level_name, b.direct_warehouse, b.annex_url, b.material_quantity as in_order_material_quantity, b.quantity as in_order_quantity
-        ,b.NEED_CUSTOMS_DECLARATION
+        ,b.NEED_CUSTOMS_DECLARATION,b.completion_time
     </sql>
 
     <sql id="joinStockInOrderPoWhere">

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

@@ -26,6 +26,10 @@ 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="pushStatus"    column="push_status"    />
+        <result property="pushTime"    column="push_time"    />
+        <result property="pushBy"    column="push_by"    />
+        <result property="pushByName"    column="push_by_name"    />
     </resultMap>
 
 
@@ -34,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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.push_status,a.push_time,a.push_by,a.push_by_name
     </sql>
 
     <sql id="selectStockShelfOrderPo1">