公司新增缩写

api/application/config/response.php

@@ -163,6 +163,7 @@ $config['response']['1000'] = "公司名称不能为空";
 $config['response']['1001'] = "公司ID不能为空";
 $config['response']['1002'] = "请选择公司类型";
 $config['response']['1003'] = "公司名称已经存在";
+$config['response']['1004'] = "公司名称缩写已经存在";
 
 
 // 英文版
@@ -328,5 +329,6 @@ $config['response_en']['1000'] = "Company name cannot be empty";
 $config['response_en']['1001'] = "Company ID cannot be empty";
 $config['response_en']['1002'] = "Please select company type";
 $config['response_en']['1003'] = "Company name already exists";
+$config['response_en']['1004'] = "Company name abbreviation already exists";
 
 

api/application/controllers/Company.php

@@ -46,19 +46,33 @@ class Company extends Base_Controller {
 		$type = intval($this->input->post('type',true));
 		if ($type === '' || $type === null) exit(json_result('1002',$this->response['1002']));
 
+		$no = trim($this->input->post('no',true));
 		if (empty($id)) {  // 添加
 			if ($this->Company_model->getDataCount(array('name'=>$name)) > 0) {
                 exit(json_result('1003', $this->response['1003']));
             }   
 
+            if ($no !== '' && $no !== null && $this->Company_model->getDataCount(array('no'=>$no)) > 0) {
+                exit(json_result('1004', $this->response['1004']));
+            }   
+
             $data = array('type'=>$type,'name'=>$name,'companyId'=>$companyId,'createTime'=>date('Y-m-d H:i:s',time()));
+
+            if ($no !== '' && $no !== null) $data['no'] = $no;
             $this->Company_model->add($data);
 		}else {  // 编辑
 			if ($this->Company_model->getDataCount(array('name'=>$name),$id) > 0) {
                 exit(json_result('1003', $this->response['1003']));
             }   
 
+            if ($no !== '' && $no !== null && $this->Company_model->getDataCount(array('no'=>$no),$id) > 0) {
+                exit(json_result('1004', $this->response['1004']));
+            }   
+
+
 			$data = array('type'=>$type,'name'=>$name,'companyId'=>$companyId);
+
+			if ($no !== '' && $no !== null) $data['no'] = $no;
             $this->Company_model->update($data,['id'=>$id]);
 		}
 

api/application/controllers/Project.php

@@ -441,19 +441,19 @@ class Project extends Base_Controller {
                 $join[] = ['table'=>'company as C','cond'=>'L.manu = C.id','type'=>'inner'];
                 $group = 'L.manu,L.projectid';
                 $order = 'convert(C.name using gbk) asc';
-                $fields = 'C.name as company,P.projectname,P.id,C.id as cId,count(*) as lampcount';
+                $fields = 'C.name as company,C.no,P.projectname,P.id,C.id as cId,count(*) as lampcount';
             }elseif ($type == 3) {
                 $sectionWhere = ['supplier !='=>0];
                 $join[] = ['table'=>'company as C','cond'=>'L.supplier = C.id','type'=>'inner'];
                 $group = 'L.supplier,L.projectid';
                 $order = 'convert(C.name using gbk) asc';
-                $fields = 'C.name as company,P.projectname,P.id,C.id as cId,count(*) as lampcount';
+                $fields = 'C.name as company,C.no,P.projectname,P.id,C.id as cId,count(*) as lampcount';
             }elseif ($type == 4) {
                 $sectionWhere = ['po !='=>0];
                 $join[] = ['table'=>'company as C','cond'=>'L.po = C.id','type'=>'inner'];
                 $group = 'L.po,L.projectid';
                 $order = 'convert(C.name using gbk) asc';
-                $fields = 'C.name as company,P.projectname,P.id,C.id as cId,count(*) as lampcount';
+                $fields = 'C.name as company,C.no,P.projectname,P.id,C.id as cId,count(*) as lampcount';
             }else {
                 // $sectionWhere = ['upazilla !='=>0];
                 $join[] = ['table'=>'global_location as G','cond'=>'G.id = P.cityid','type'=>'left'];
@@ -470,6 +470,7 @@ class Project extends Base_Controller {
                 foreach ($data as $key => $value) {
                     $value['sectionList'] = array();
                     $temp[$value['id']] = $value;
+                    if (isset($value['no']) && $value['no'] !== '') $value['company'] = $value['no'];
                     $temp2[$value['cId']] = array('company'=>$value['company'],'lampcount'=>$value['lampcount'],'cId'=>$value['cId'],'projectList'=>array());
                 }
                 $projectIdArr = array_column($data, 'id');