优化

application/api/controller/ReportingWork.php

@@ -352,7 +352,7 @@ class ReportingWork extends Api
 
         $rows = db('设备_工分计酬')
             ->where('del_rq', null)
-            ->where('date', $params['date'])
+            ->where('date', 'like', $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,money,coefficient,number,production_hour,production_score,

application/api/controller/StaffSalary.php

@@ -81,7 +81,7 @@ class StaffSalary extends Api
             ->group('a.staff_no,a.staff_name')
             ->select();
         if(empty($staff)){
-            $this->error('该部门没有员工');
+            $this->error('该工序没有报工数据');
         }
 
         $staffMap = [];
@@ -95,7 +95,7 @@ class StaffSalary extends Api
             ->where('del_rq', null)
             ->where('date', 'like', $param['month'] . '%')
             ->where('staff_no', 'in', $staffNos)
-            ->field('staff_no,staff_name,DATE_FORMAT(date, "%Y-%m-%d") as date,sum(salary) as salary')
+            ->field('staff_no,staff_name,DATE_FORMAT(date, "%Y-%m-%d") as date,sum(salary) as salary,sys_id')
             ->group('staff_no,DATE_FORMAT(date, "%Y-%m-%d")')
             ->order('staff_no asc,date asc')
             ->select();
@@ -152,7 +152,7 @@ class StaffSalary extends Api
             ->field('a.work_order as 订单编号,DATE_FORMAT(a.date, "%Y-%m-%d") as 日期,b.part_name as 部件名称,
             a.part_code as 部件编号,a.salary as 工资,a.number as 数量,a.production_hour as 生产工时,a.production_score as 生产分数,
             a.machine as 设备名称,a.process_name as 工序名称,a.standard_hour as 标准工时,a.standard_score as 标准分数,
-            a.coefficient as 系数')
+            a.coefficient as 系数,a.sys_id as 设备编号')
             ->where($where)
             ->order('a.date asc,a.process_code asc')
             ->select();