|
|
@@ -56,7 +56,7 @@ class StaffSalary extends Api
|
|
|
$options = [
|
|
|
'host' => '127.0.0.1',
|
|
|
'port' => 6379,
|
|
|
- 'password' => '',
|
|
|
+ 'password' => '123456',
|
|
|
'select' => 15,
|
|
|
'timeout' => 0,
|
|
|
'expire' => 0,
|
|
|
@@ -98,6 +98,9 @@ class StaffSalary extends Api
|
|
|
$delRes = \db('绩效工资汇总')->where('sczl_rq','between',[$startDate,$endDate])->delete();
|
|
|
$where = [];
|
|
|
$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,
|
|
|
@@ -226,14 +229,14 @@ class StaffSalary extends Api
|
|
|
->field('a.sczl_gdbh, a.sczl_yjno, a.sczl_gxh, sczl_type, a.sczl_rq, a.sczl_jtbh,
|
|
|
a.sczl_ms, a.sczl_cl as 班组车头产量, a.sczl_fp as sczl_zcfp, a.sczl_装版工时 as 装版工时, a.sczl_保养工时 as 保养工时,
|
|
|
a.sczl_打样工时 as 打样工时, a.sczl_异常停机工时 as 异常停机工时, a.sczl_设备运行工时 as 车头产量占用机时, a.sczl_bh1,
|
|
|
- a.sczl_rate1, b.千件工价, b.日定额, b.补产标准, c.工价系数 as 工序难度系数, d.员工姓名')
|
|
|
+ a.sczl_rate1, b.千件工价, b.日定额, b.补产标准,a.sczl_工价系数 as 工序难度系数,a.拆片联拼系数,a.拆片条小盒系数, d.员工姓名')
|
|
|
->join('dic_lzde b', 'a.sczl_dedh = b.sys_bh','left')
|
|
|
->join('工单_工艺资料 c', 'a.sczl_gdbh = c.Gy0_gdbh AND a.sczl_yjno = c.Gy0_yjno AND a.sczl_gxh = c.Gy0_gxh','left')
|
|
|
->join('人事_基本资料 d', 'a.sczl_bh1 = d.员工编号','left')
|
|
|
->where($where)
|
|
|
->select();
|
|
|
foreach ($query as $value){
|
|
|
- $value['班组车头产量'] = $value['班组车头产量'] - $value['sczl_zcfp'];
|
|
|
+ $value['班组车头产量'] = ($value['班组车头产量'] - $value['sczl_zcfp']) * $value['拆片联拼系数'] * $value['拆片条小盒系数'];
|
|
|
//计件产量
|
|
|
if ($value['工序难度系数'] <= 0 || empty($value['工序难度系数'])){
|
|
|
$value['工序难度系数'] = '1.0000';
|
|
|
@@ -435,7 +438,7 @@ class StaffSalary extends Api
|
|
|
}else{
|
|
|
$cl = $value[$clKey];
|
|
|
}
|
|
|
- if (strpos($item['sczl_type'],'包装')){
|
|
|
+ if ($item['sczl_type'] === '包装'){
|
|
|
$item['班组车头产量'] = $cl * $value[$pgclKey] * $value[$jcxsKey] / $num;
|
|
|
}else{
|
|
|
$item['班组车头产量'] = $cl;
|