|
@@ -672,11 +672,20 @@ class Systembound extends Start_Controller {
|
|
$waybill = $this->input->get('waybill',true);
|
|
$waybill = $this->input->get('waybill',true);
|
|
$timetk = strtotime($timetk);
|
|
$timetk = strtotime($timetk);
|
|
$timetj = strtotime($timetj);
|
|
$timetj = strtotime($timetj);
|
|
-
|
|
|
|
- $cx_arr = [7,50,51,52,69,73];//需要的查询数据
|
|
|
|
|
|
+ $select_express = $this->input->get('select_express',true);
|
|
|
|
+ if($select_express == 'ozyt'){
|
|
|
|
+ //云途(欧洲) 云途(欧洲)-带保险
|
|
|
|
+ $cx_arr = [66,67];//需要的查询数据
|
|
|
|
+ $typename = "云途(欧洲)";
|
|
|
|
+ }else{
|
|
|
|
+ //GES 7 惠城联邦 50 惠城GES 51 惠城安迈世 51 惠城DHL 69 惠城usps 73
|
|
|
|
+ $cx_arr = [7,50,51,52,69,73];//需要的查询数据
|
|
|
|
+ $typename = "惠程";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
$ex_list = $this->express->find_all("id in (".implode(',',$cx_arr).")","id,servicename");
|
|
$ex_list = $this->express->find_all("id in (".implode(',',$cx_arr).")","id,servicename");
|
|
- //GES 7 惠城联邦 50 惠城GES 51 惠城安迈世 51 惠城DHL 69 惠城usps 73
|
|
|
|
|
|
+
|
|
$where = "type != 0 and express in (".implode(',',$cx_arr).")";
|
|
$where = "type != 0 and express in (".implode(',',$cx_arr).")";
|
|
|
|
|
|
if($timetk && $timetj)
|
|
if($timetk && $timetj)
|
|
@@ -740,7 +749,8 @@ class Systembound extends Start_Controller {
|
|
$data[] = $datafy;
|
|
$data[] = $datafy;
|
|
//格式化数据
|
|
//格式化数据
|
|
$i = 0;$cpexcel = array();
|
|
$i = 0;$cpexcel = array();
|
|
- $title = date('Ymd',time())."惠程发货统计信息"; $td = '';
|
|
|
|
|
|
+
|
|
|
|
+ $title = date('Ymd',time()).$typename."发货统计信息"; $td = '';
|
|
$td = "";
|
|
$td = "";
|
|
$count = 0;
|
|
$count = 0;
|
|
foreach($ex_list as $v){
|
|
foreach($ex_list as $v){
|