|
|
@@ -224,9 +224,9 @@ class StaffSalary extends Api
|
|
|
* 拆片工序数据
|
|
|
*/
|
|
|
$query = Db::name('db_sczl')->alias('a')
|
|
|
- ->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,
|
|
|
+ ->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.补产标准,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')
|
|
|
@@ -442,7 +442,7 @@ class StaffSalary extends Api
|
|
|
$item['班组车头产量'] = $cl;
|
|
|
}
|
|
|
$item['工价系数'] = '0.0000';
|
|
|
- $item['工序难度系数'] = $value[$gxKey];
|
|
|
+ $item['工序难度系数'] = $value[$jcxsKey];
|
|
|
if ($value[$gxKey] <= 0){
|
|
|
$item['工序难度系数'] = '1.0000';
|
|
|
}
|
|
|
@@ -472,7 +472,6 @@ class StaffSalary extends Api
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// halt($data);
|
|
|
// 用于存储bh对应的工时占比总和
|
|
|
$bhTotals = [];
|
|
|
// 遍历原始数据
|
|
|
@@ -530,7 +529,6 @@ class StaffSalary extends Api
|
|
|
$data[$key]['法定天数'] = $params['days'];
|
|
|
$data[$key]['sczl_type'] = trim($item['sczl_type']);
|
|
|
}
|
|
|
-
|
|
|
// 检查任务是否已经存在于队列中，如果不存在则推送任务到队列
|
|
|
if (!$redis->has($taskIdentifier)) {
|
|
|
$job = new InsertDataJob($data); // 创建任务实例
|
