Browse Source

员工计件工资核算优化

曹鹤洋 1 year ago
parent
commit
5a1fdb466f
1 changed files with 1 additions and 2 deletions
  1. 1 2
      application/api/controller/StaffSalary.php

+ 1 - 2
application/api/controller/StaffSalary.php

@@ -100,7 +100,6 @@ class StaffSalary extends Api
         $where['a.sczl_rq'] = ['between',[$startDate,$endDate]];
         //查询印刷印后车间的机台,添加搜索条件
         $jtbhs = db('设备_基本资料')->where('使用部门','in',['印刷车间','印后车间'])->column('设备编号');
-        $where['a.sczl_jtbh'] = ['in',$jtbhs];
         $fields = "a.sczl_gdbh,a.sczl_yjno,a.sczl_gxh,a.sczl_gxmc as sczl_type,a.sczl_rq,a.sczl_jtbh,a.sczl_工价系数,a.sczl_ms,a.sczl_cl as 班组车头产量,a.sczl_Pgcl,a.sczl_zcfp,
                 a.sczl_装版工时 as 装版工时,a.sczl_保养工时 as 保养工时,a.sczl_打样工时 as 打样工时,a.sczl_异常停机工时 as 异常停机工时,a.sczl_设备运行工时 as 车头产量占用机时,
                 a.sczl_bh1,a.sczl_bh2,a.sczl_bh3,a.sczl_bh4,a.sczl_bh5,a.sczl_bh6,a.sczl_bh7,a.sczl_bh8,a.sczl_bh9,a.sczl_bh10,
@@ -120,7 +119,7 @@ class StaffSalary extends Api
             $alias = 'd' . $i;
             $query->join("人事_基本资料 $alias", "$field = {$alias}.员工编号 AND {$field} IS NOT NULL", 'LEFT');
         }
-        $query->where($where);
+        $query->where($where)->where('a.sczl_jtbh','in',$jtbhs);
         $list = $query->select();
         $UniqId = \db('绩效工资汇总')->field('UniqID')->order('UniqID desc')->find();
         if (empty($UniqId)){