Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -419,7 +419,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>
@@ -1519,7 +1518,6 @@
             GROUP BY xxsoi.sales_id
         )xxnewsoi ON tt.sales_id = xxnewsoi.sales_id
         <where>
-            sales_status != 3
             <if test="salesShippingStatus !=null">
                 AND tt.sales_shipping_status = #{salesShippingStatus}
             </if>
@@ -1815,7 +1813,6 @@
         LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
         <where>
-            sales_status != 3
             <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
                 AND sales_batch_id != 'KS00000000000001'
             </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});