|
|
@@ -410,7 +410,6 @@ class GluingReport extends Api
|
|
|
$list['班组编号'] = rtrim($data['sczl_bzbh']);
|
|
|
$idList = explode(',',$data['班组ID']);
|
|
|
foreach ($idList as $k=>$v){
|
|
|
- $row[$k] = [];
|
|
|
$class = \db('设备_糊盒班组资料')
|
|
|
->where('id',$v)
|
|
|
->field("role,rate,bh1,bh2,bh3,bh4,bh5,bh6,bh7,bh8,bh9,bh10,bh11,bh12,bh13,bh14,bh15")
|
|
|
@@ -419,7 +418,7 @@ class GluingReport extends Api
|
|
|
for ($i=1;$i<16;$i++) {
|
|
|
if ($class['bh' . $i] != '' && $class['bh' . $i] != '000000') {
|
|
|
$name = \db('人事_基本资料')->where('员工编号', $class['bh' . $i])->field('rtrim(员工姓名) as 姓名')->find();
|
|
|
- $row[$k][] = [
|
|
|
+ $row[] = [
|
|
|
'编号' => $class['bh' . $i],
|
|
|
'姓名' => $name['姓名'],
|
|
|
'比例' => $class['rate'],
|
|
|
@@ -464,6 +463,7 @@ class GluingReport extends Api
|
|
|
$data['sczl_gxmc'] = empty($params['gy_name']) ? '' : $params['gy_name'];
|
|
|
$data['sczl_bzbh'] = $params['sczl_bzdh'];
|
|
|
$data['班组ID'] = $params['team_id'];
|
|
|
+
|
|
|
// 获取当前时间
|
|
|
$current_time = time();
|
|
|
// 设置时间范围
|
