|
@@ -31,10 +31,14 @@ class GluingReport extends Api
|
|
|
->order('设备编组')
|
|
->order('设备编组')
|
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
|
if (empty($department)){
|
|
if (empty($department)){
|
|
|
- $this->success('为获取到机台数据');
|
|
|
|
|
|
|
+ $this->success('未获取到机台数据');
|
|
|
}
|
|
}
|
|
|
foreach ($department as $value){
|
|
foreach ($department as $value){
|
|
|
- $machine = \db('设备_基本资料')->where('使用部门',$value)->where('sys_sbID','<>','')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->order('设备编号')->select();
|
|
|
|
|
|
|
+ $machine = \db('设备_基本资料')
|
|
|
|
|
+ ->where('使用部门',$value)
|
|
|
|
|
+ ->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')
|
|
|
|
|
+ ->order('设备编号')
|
|
|
|
|
+ ->select();
|
|
|
foreach ($machine as $k=>$v){
|
|
foreach ($machine as $k=>$v){
|
|
|
$data[rtrim($value)][] = $v['设备编号'].'-->'.$v['设备名称'];
|
|
$data[rtrim($value)][] = $v['设备编号'].'-->'.$v['设备名称'];
|
|
|
}
|
|
}
|
|
@@ -406,7 +410,6 @@ class GluingReport extends Api
|
|
|
->distinct(true)
|
|
->distinct(true)
|
|
|
->where('使用部门','in',$sist)
|
|
->where('使用部门','in',$sist)
|
|
|
->where('设备编组','<>','')
|
|
->where('设备编组','<>','')
|
|
|
- ->where('sys_sbID','<>','')
|
|
|
|
|
->order('设备编组')
|
|
->order('设备编组')
|
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
->column('rtrim(使用部门) as 使用部门');
|
|
|
if (empty($department)){
|
|
if (empty($department)){
|
|
@@ -422,7 +425,11 @@ class GluingReport extends Api
|
|
|
->select();
|
|
->select();
|
|
|
|
|
|
|
|
foreach ($department as $value){
|
|
foreach ($department as $value){
|
|
|
- $machine = \db('设备_基本资料')->where('使用部门',$value)->where('sys_sbID','<>','')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->order('设备编号')->select();
|
|
|
|
|
|
|
+ $machine = \db('设备_基本资料')
|
|
|
|
|
+ ->where('使用部门',$value)
|
|
|
|
|
+ ->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')
|
|
|
|
|
+ ->order('设备编号')
|
|
|
|
|
+ ->select();
|
|
|
foreach ($machine as $k=>$v){
|
|
foreach ($machine as $k=>$v){
|
|
|
$data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']] = [];
|
|
$data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']] = [];
|
|
|
foreach ($list as $kk=>$vv){
|
|
foreach ($list as $kk=>$vv){
|
