|
|
@@ -216,7 +216,7 @@ class Decision extends Api
|
|
|
'a.sczl_jtbh' => '机台编号',
|
|
|
'a.sczl_bzdh' => '班组编号',
|
|
|
'SUM(a.sczl_cl)' => '产量',
|
|
|
- 'a.sczl_ms' => '墨色数',
|
|
|
+ 'd.Gy0_ms' => '墨色数',
|
|
|
'rtrim(d.印刷方式)' => '印刷方式',
|
|
|
'rtrim(d.版距)' => '版距'
|
|
|
])
|
|
|
@@ -640,7 +640,7 @@ class Decision extends Api
|
|
|
$item['type_id'] = $group['id'];
|
|
|
$item['type_name'] = $group['name'];
|
|
|
$processedList[] = $item;
|
|
|
- continue 2; // 匹配成功则跳出两层循环
|
|
|
+ continue 2;
|
|
|
}
|
|
|
}
|
|
|
// 未匹配的条目将被丢弃
|
|
|
@@ -654,7 +654,7 @@ class Decision extends Api
|
|
|
// 返回结构
|
|
|
$data['data'] = $processedList;
|
|
|
$data['total'] = $total;
|
|
|
- $data['filtered_total'] = count($processedList);
|
|
|
+ $data['filtered_total'] = count($processedList);
|
|
|
|
|
|
return count($processedList) > 0
|
|
|
? $this->success('成功', $data)
|
|
|
@@ -693,7 +693,7 @@ class Decision extends Api
|
|
|
'a.sczl_gxh' => '工序号',
|
|
|
'd.Gy0_gxmc' => '工序名称',
|
|
|
'SUM(a.sczl_cl)' => '产量',
|
|
|
- 'a.sczl_ms' => '墨色数',
|
|
|
+ 'd.Gy0_ms' => '墨色数',
|
|
|
'rtrim(d.印刷方式)' => '印刷方式',
|
|
|
'rtrim(d.版距)' => '版距',
|
|
|
'rtrim(d.Gy0_SITE)' => '车间名称',
|
