|
|
@@ -1459,7 +1459,7 @@ class WorkOrder extends Api
|
|
|
}
|
|
|
foreach ($list as $key=>$value){
|
|
|
$list[$key]['客户编号'] = rtrim($value['客户编号']);
|
|
|
- $list[$key]['客户名称'] = rtrim($value['客户编号']).'【'.$value['客户名称'].'】';
|
|
|
+ $list[$key]['name'] = rtrim($value['客户编号']).'【'.$value['客户名称'].'】';
|
|
|
if ($value['客户编号'] == '1098'){
|
|
|
$list[$key]['客户名称'] = '打样专用';
|
|
|
}
|
|
|
@@ -1485,14 +1485,7 @@ class WorkOrder extends Api
|
|
|
if (isset($param['cilent']) === false){
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
- if (isset($param['productCode'])){
|
|
|
- $where = [
|
|
|
- '客户编号' => ['like',$param['cilent'].'%'],
|
|
|
- '产品编号' => ['like',$param['productCode'].'%']
|
|
|
- ];
|
|
|
- }else{
|
|
|
- $where = ['客户编号'=>['like',$param['cilent'].'%']];
|
|
|
- }
|
|
|
+ $where = ['产品编号'=>['like',$param['cilent'].'%']];
|
|
|
$list = \db('产品_基本资料')
|
|
|
->where($where)
|
|
|
->field('rtrim(产品编号) as 产品编号,rtrim(产品名称) as 产品名称')
|
|
|
@@ -1501,7 +1494,7 @@ class WorkOrder extends Api
|
|
|
$this->success('未获取到产品数据');
|
|
|
}
|
|
|
foreach ($list as $key=>$value){
|
|
|
- $list[$key]['产品名称'] = $value['产品编号'].'【'.$value['产品名称'].'】';
|
|
|
+ $list[$key]['name'] = $value['产品编号'].'【'.$value['产品名称'].'】';
|
|
|
}
|
|
|
$this->success('成功',$list);
|
|
|
}
|