|
|
@@ -225,7 +225,6 @@ class Decision extends Api
|
|
|
->order('工作日期')
|
|
|
->page($page, $limit) // 使用 page 和 limit 实现分页
|
|
|
->select();
|
|
|
-
|
|
|
// 数据处理
|
|
|
if (!empty($list)) {
|
|
|
foreach ($list as $key => $value) {
|
|
|
@@ -697,12 +696,12 @@ class Decision extends Api
|
|
|
'rtrim(d.印刷方式)' => '印刷方式',
|
|
|
'rtrim(d.版距)' => '版距',
|
|
|
'rtrim(d.Gy0_SITE)' => '车间名称',
|
|
|
- 'rtrim(e.设备编组)' => '设备编组'
|
|
|
+ 'rtrim(e.设备编组)' => '设备编组',
|
|
|
+ 'a.sczl_jtbh'
|
|
|
])
|
|
|
->where($where)
|
|
|
->group('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh')
|
|
|
->select();
|
|
|
-
|
|
|
$data = [];
|
|
|
if (!empty($list)) {
|
|
|
foreach ($list as $key => $value) {
|
