|
|
@@ -320,10 +320,10 @@ class Manufacture extends Api
|
|
|
$this->success('为获取到机台数据');
|
|
|
}
|
|
|
foreach ($department as $value){
|
|
|
- $benchClass = \db('设备_基本资料')->where('使用部门',$value)->distinct(true)->order('设备编组')->cache(true)->column('设备编组');
|
|
|
+ $benchClass = \db('设备_基本资料')->where('使用部门',$value)->distinct(true)->order('设备编组')->column('设备编组');
|
|
|
foreach ($benchClass as $v){
|
|
|
if (rtrim($v) !== ''){
|
|
|
- $machine = \db('设备_基本资料')->where('使用部门',$value)->where('设备编组',$v)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->cache(true)->select();
|
|
|
+ $machine = \db('设备_基本资料')->where('使用部门',$value)->where('设备编组',$v)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->select();
|
|
|
foreach ($machine as $kk=>$vv){
|
|
|
$data[rtrim($value)][rtrim($v)][$kk] = $vv['设备编号'].'-->'.$vv['设备名称'];
|
|
|
}
|