报工数据字段优化

application/api/controller/ReportingWork.php

@@ -373,7 +373,9 @@ class ReportingWork extends Api
             ->where('del_rq', null)
             ->where('date', $params['date'])
             ->where('machine', $params['machine'])
-            ->field('id,work_order,majorprocess,part_code,process_code,process_name,staff_no,staff_name,standard_hour,standard_score,coefficient,number,production_hour,production_score,machine,sys_id,sys_rq')
+            ->field('id,work_order,majorprocess,part_code,process_code,process_name,staff_no,staff_name,standard_hour,
+            standard_score,standard_minutes,money,coefficient,number,production_hour,production_score,production_minutes,
+            salary,machine,sys_id,sys_rq')
             ->order('process_code asc,staff_no asc')
             ->select();
 
@@ -398,10 +400,14 @@ class ReportingWork extends Api
                 'staff_name' => $row['staff_name'],
                 'standard_hour' => $row['standard_hour'],
                 'standard_score' => $row['standard_score'],
+                'standard_minutes' => $row['standard_minutes'],
+                'money' => $row['money'],
                 'coefficient' => $row['coefficient'],
                 'number' => $row['number'],
                 'production_hour' => $row['production_hour'],
                 'production_score' => $row['production_score'],
+                'production_minutes' => $row['production_minutes'],
+                'salary' => $row['salary'],
                 'sys_id' => $row['sys_id'],
                 'sys_rq' => $row['sys_rq'],
                 'id' => $row['id'],
@@ -439,7 +445,9 @@ class ReportingWork extends Api
             'number' => $params['number'],
             'production_hour' => $params['production_hour'],
             'production_score' => $params['production_score'],
-            'salary' => $params['production_score'] * 0.5,
+            'production_minutes' => $params['production_minutes'],
+            'money' => $params['money'],
+            'salary' => $params['money'] * $params['number'],
         ];
         $result = db('设备_工分计酬')
             ->where('id', $params['id'])
@@ -507,7 +515,9 @@ class ReportingWork extends Api
             ->where('del_rq', null)
             ->where('date', 'like', $params['date'] . '%')
             ->where('machine', $params['machine'])
-            ->field('work_order,majorprocess,part_code,process_code,process_name,staff_no,staff_name,standard_hour,standard_score,coefficient,number,production_hour,production_score,machine,sys_id,sys_rq')
+            ->field('work_order,majorprocess,part_code,process_code,process_name,staff_no,staff_name,
+            standard_hour,standard_score,standard_minutes,money,coefficient,number,production_hour,
+            production_score,production_minutes,salary,machine,sys_id,sys_rq,id')
             ->order('process_code asc,staff_no asc')
             ->select();
         $this->success('成功', $rows);