|
|
@@ -1309,6 +1309,22 @@ class Lampcontrol extends Base_Controller {
|
|
|
$res["updatetime"] = date_change($res["updatetime"],0,DEF_TIMEZONE);
|
|
|
|
|
|
$projectname = $this->Project_model->get_one(['id'=>$res['projectid']],'projectname');
|
|
|
+ $supplier_name = '';
|
|
|
+ $model_name = '';
|
|
|
+ if (!empty($res['supplier'])) {
|
|
|
+ $com = $this->Company_model->get_one(['id'=>$res['supplier']],'name,no');
|
|
|
+ if (empty($com['name']) && empty($com['no'])){
|
|
|
+ $supplier_name = '';
|
|
|
+ }else{
|
|
|
+ $supplier_name = empty($com['no']) ? $com['name'] : $com['no'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ($res['model']) {
|
|
|
+ $model_info = $this->db->query('select * from model_info where id = '.$res['model'])->row_array();
|
|
|
+ if (!empty($model_info) && !empty($model_info['name'])) {
|
|
|
+ $model_name = $model_info['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
$data = array(
|
|
|
"lamp_no" => $res["number"],
|
|
|
"project_name" => $this->Project_model->getNameById($res["projectid"]),
|
|
|
@@ -1338,6 +1354,8 @@ class Lampcontrol extends Base_Controller {
|
|
|
'iccid' => $res['iccid'],
|
|
|
'projectname' => $projectname['projectname'],
|
|
|
'projectid' => $res['projectid'],
|
|
|
+ 'supplier_name' => $supplier_name,
|
|
|
+ 'model_name' => $model_name,
|
|
|
);
|
|
|
// $msisdn = $this->db->query('select iccid from msisdn where imsi = "'.$res['simid'].'"')->row_array();
|
|
|
// if (empty($msisdn) || empty($msisdn['iccid'])) {
|
