上传订单ajax时间延长

订单查询分页数据，作废订单只能查询一页

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -415,7 +415,6 @@
         LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         <where>
-            sales_status != 3
             <if test="salesIsDownload !=null and salesIsDownload !=''">
                 AND sales_is_download = #{salesIsDownload}
             </if>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order_new.ftl

@@ -686,6 +686,7 @@
             },
             dataType: 'json',
             async: false,
+            timeout: 600000,
             success:function(result) {
                 if (result.returnCode != 200) {
                     layer.msg('加载失败，请重试，请确认选择内容对应无误!',{icon: 5,time:3000});