|
|
@@ -219,6 +219,7 @@ class Facility extends Api
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
$machine = $params['machine'];
|
|
|
+ $machineCode = \db('dic_lzde')->where('适用机型',$machine)->value('sys_bh');
|
|
|
$data = \db('设备_产量采集')->where('设备编号',$machine)->order('UniqId desc')->find();
|
|
|
$endTime = \db('工单_工艺资料')
|
|
|
->where('Gy0_gdbh',$data['工单编号'])
|
|
|
@@ -268,6 +269,7 @@ class Facility extends Api
|
|
|
}
|
|
|
$row = array_values($row);
|
|
|
$list['班组成员'] = $row;
|
|
|
+ $list['定额代号'] = $machineCode;
|
|
|
$this->success('成功',$list);
|
|
|
}
|
|
|
|
|
|
@@ -308,7 +310,10 @@ class Facility extends Api
|
|
|
RTRIM(a.成品代号) AS 产品代号,
|
|
|
SUM(E.sczl_cl) AS 已完成,
|
|
|
rtrim(b.Gy0_计划接货数) AS 计划接货数,
|
|
|
- RTRIM(b.Gy0_ls) AS ls
|
|
|
+ RTRIM(b.Gy0_ls) AS ls ,
|
|
|
+ rtrim(b.Gy0_班次安排) AS 班组,
|
|
|
+ rtrim(b.UniqId) AS UniqId,
|
|
|
+ rtrim(b.Gy0_最早开工时间) AS 最早开工时间
|
|
|
FROM
|
|
|
`工单_基本资料` AS a
|
|
|
JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh
|
|
|
@@ -340,7 +345,7 @@ class Facility extends Api
|
|
|
$orderList[$key]['工序名称'] = $orderList[$key]['gxh'].'-'.$value['gxmc'].'【'.$value['add_gxmc'].'】';
|
|
|
$orderList[$key]['计划产量/已完成'] = (int)($value['计划接货数']/$value['ls']).'/'.$value['已完成']=null?'':(int)$value['已完成'];
|
|
|
$orderList[$key]['计划生产时段'] =substr($value['sj1'],5,5).' '.substr($value['sj1'],11,5).'<-->'.substr($value['sj2'],5,5).' '.substr($value['sj2'],11,5);
|
|
|
- unset($orderList[$key]['gdbh'],$orderList[$key]['质量信息'],$orderList[$key]['yjno'],$orderList[$key]['gxh'],$orderList[$key]['gxmc'],$orderList[$key]['add_gxmc'],$orderList[$key]['sj1'],$orderList[$key]['sj2'],$orderList[$key]['计划接货数'],$orderList[$key]['已完成'],$orderList[$key]['印件名称'],$orderList[$key]['ls']);
|
|
|
+ unset($orderList[$key]['gdbh'],$orderList[$key]['质量信息'],$orderList[$key]['yjno'],$orderList[$key]['gxh'],$orderList[$key]['gxmc'],$orderList[$key]['add_gxmc'],$orderList[$key]['计划接货数'],$orderList[$key]['已完成'],$orderList[$key]['印件名称'],$orderList[$key]['ls']);
|
|
|
}
|
|
|
$this->success('成功',$orderList);
|
|
|
}
|
