no message

api/application/controllers/Home.php

@@ -412,6 +412,14 @@ class Home extends Base_Controller {
             array('name'=>'路灯亮度(%)','field'=>'L.lighteness','fields1'=>'lighteness','enname'=>'Brightness(%)'),
             array('name'=>'无线模块地址','field'=>'L.address','fields1'=>'address','enname'=>'Wireless module address'),
             array('name'=>'负载功率(W)','field'=>'RI.loadpower','fields1'=>'loadpower','enname'=>'LED power(W)'),
+            array('name'=>'Street light SN','field'=>'L.street_light_SN','fields1'=>'street_light_SN','enname'=>'Street light SN'),
+            array('name'=>'Customer ID','field'=>'L.customer_ID','fields1'=>'customer_ID','enname'=>'Customer ID'),
+            array('name'=>'Customer name','field'=>'L.customer_name','fields1'=>'customer_name','enname'=>'Customer name'),
+            array('name'=>'Fascal year','field'=>'L.fascal_year','fields1'=>'fascal_year','enname'=>'Fascal year'),
+            array('name'=>'Fascal year phase','field'=>'L.fascal_year_phase','fields1'=>'fascal_year_phase','enname'=>'Fascal year phase'),
+            array('name'=>'PO name','field'=>'C1.name as po_name,C1.no as po_no','fields1'=>'po_name','enname'=>'PO name'),
+            array('name'=>'Supplier name','field'=>'C2.name as supplier_name,C2.no as supplier_no','fields1'=>'supplier_name','enname'=>'Supplier name'),
+            array('name'=>'MFRS name','field'=>'C3.name as MFRS_name,C3.no as MFRS_no','fields1'=>'MFRS_name','enname'=>'MFRS name'),
             array('name'=>'蓄电池电压(V)','field'=>'RI.batvoltage as battvoltage','fields1'=>'battvoltage','enname'=>'Battery voltage(V)'),
             array('name'=>'蓄电池总过放次数','field'=>'HI.overtimes','fields1'=>'overtimes','enname'=>'Over discharge times'),
             array('name'=>'太阳能板功率(W)','field'=>'RI.panelpower as solarpower','fields1'=>'solarpower','enname'=>'Solar panel power(W)'),

api/application/controllers/Lampcontrol.php

@@ -126,6 +126,9 @@ class Lampcontrol extends Base_Controller {
             $join = array();
 
             $join[] = ['table'=>'project as P', 'cond'=>'L.projectid = P.id', 'type'=>'left'];
+            $join[] = ['table'=>'company as C1', 'cond'=>'L.po = C1.id', 'type'=>'left'];
+            $join[] = ['table'=>'company as C2', 'cond'=>'L.supplier = C2.id', 'type'=>'left'];
+            $join[] = ['table'=>'company as C3', 'cond'=>'L.manu = C3.id', 'type'=>'left'];
             // $join[] = ['table'=>'(select t1.* from alarm_info_log t1, (select lampid, max(updatetime) as maxtime from alarm_info_log group by lampid) t2 where t1.lampid = t2.lampid and t1.updatetime = t2.maxtime) as AI', 'cond'=>'L.id = AI.lampid', 'type'=>'left'];
             $join[] = ['table'=>'(select t1.* from warning_info_log t1, (select lampid, max(updatetime) as maxtime from warning_info_log group by lampid) t2 where t1.lampid = t2.lampid and t1.updatetime = t2.maxtime) as AI', 'cond'=>'L.id = AI.lampid', 'type'=>'left'];
             $join[] = ['table'=>'(select t1.* from history_info_log t1, (select lampid, max(updatetime) as maxtime from history_info_log group by lampid) t2 where t1.lampid = t2.lampid and t1.updatetime = t2.maxtime) as HI', 'cond'=>'L.id = HI.lampid', 'type'=>'left'];
@@ -335,6 +338,16 @@ class Lampcontrol extends Base_Controller {
                 if (array_key_exists('solarpower',$value)) {
                     $value['solarpower'] = !empty($value['solarpower']) ? $value['solarpower'] : 0;
                 }
+
+                if (array_key_exists('po_name',$value) && array_key_exists('po_no',$value)) {
+                    $value['po_name'] = !empty($value['po_no']) ? $value['po_no'] : $value['po_name'];
+                }
+                if (array_key_exists('supplier_name',$value) && array_key_exists('supplier_no',$value)) {
+                    $value['supplier_name'] = !empty($value['supplier_no']) ? $value['supplier_no'] : $value['supplier_name'];
+                }
+                if (array_key_exists('MFRS_name',$value) && array_key_exists('MFRS_no',$value)) {
+                    $value['MFRS_name'] = !empty($value['MFRS_no']) ? $value['MFRS_no'] : $value['MFRS_name'];
+                }
                 // 当前策略
                 if (array_key_exists('policyid',$value)) {
                     if (empty($value['policyid'])) {

api/application/helpers/function_helper.php

@@ -899,6 +899,14 @@ function get_fields_by_type($fileds,$type){
         // 'totalchargeah' => array('name'=>'蓄电池总充电安时数(ah)','enname'=>'Total charge AH(ah)'),
         // 'totaldischarah' => array('name'=>'蓄电池总放电安时数(ah)','enname'=>'Total discharge AH(ah)'),
         'policyid' => array('name'=>'当前策略','enname'=>'Current strategy'),
+        'street_light_SN' => array('name'=>'Street light SN','enname'=>'Street light SN'),
+        'customer_ID' => array('name'=>'Customer ID','enname'=>'Customer ID'),
+        'customer_name' => array('name'=>'Customer name','enname'=>'Customer name'),
+        'fascal_year' => array('name'=>'Fascal year','enname'=>'Fascal year'),
+        'fascal_year_phase' => array('name'=>'Fascal year phase','enname'=>'Fascal year phase'),
+        'po_name' => array('name'=>'PO name','enname'=>'PO name'),
+        'supplier_name' => array('name'=>'Supplier name','enname'=>'Supplier name'),
+        'MFRS_name' => array('name'=>'MFRS name','enname'=>'MFRS name'),
         'softwareVersion' => array('name'=>'版本号','enname'=>'Version information'),
     );
     $temp = [];