|
|
@@ -95,7 +95,7 @@ class Facility extends Api
|
|
|
rtrim(码开始行) as 码开始行,rtrim(码结束行) as 码结束行,rtrim(码包) as 码包,rtrim(主电表) as 主电表,rtrim(辅电表) as 辅电表,rtrim(sczl_ms) as 色度数,
|
|
|
rtrim(sys_id) as 用户,rtrim(mod_rq) as 更新时间,rtrim(sczl_异常工时1) as 异常补时,rtrim(sczl_异常类型1) as 异常类型,sczl_bh1,sczl_bh2,
|
|
|
sczl_bh3,sczl_bh4,sczl_bh5,sczl_bh6,sczl_bh7,sczl_bh8,sczl_bh9,sczl_bh10,sczl_rate1,sczl_rate2,sczl_rate3,sczl_rate4,sczl_rate5,sczl_rate6,sczl_rate7,
|
|
|
- sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId,rtrim(sczl_工价系数) as 难度系数';
|
|
|
+ sczl_rate8,sczl_rate9,sczl_rate10,sczl_bh98,rtrim(UniqId) as UniqId,rtrim(sczl_工价系数) as 难度系数,rtrim(sczl_dedh) as 定额代号';
|
|
|
//机台信息
|
|
|
$machineDetail = \db('设备_基本资料')->where('设备编号',$machine)->field('rtrim(千件工价) as 千件工价,rtrim(日定额) as 日定额')->find();
|
|
|
//组员信息
|
|
|
@@ -120,7 +120,6 @@ class Facility extends Api
|
|
|
$list[$key]['产品名称'] = $value['工单编号'];
|
|
|
$list[$key]['cpmc'] = '';
|
|
|
}
|
|
|
-
|
|
|
$process = \db('工单_工艺资料')
|
|
|
->where('Gy0_gdbh',$value['工单编号'])
|
|
|
->where('Gy0_gxh',$value['gxh'])
|
|
|
@@ -140,13 +139,9 @@ class Facility extends Api
|
|
|
if ($value['yjno']<10){
|
|
|
$list[$key]['yjno'] = '0'.$value['yjno'];
|
|
|
}
|
|
|
- if (!empty($machineDetail)){
|
|
|
- $list[$key]['千件工价'] = $machineDetail['千件工价'];
|
|
|
- $list[$key]['日定额'] = $machineDetail['日定额'];
|
|
|
- }else{
|
|
|
- $list[$key]['千件工价'] = '';
|
|
|
- $list[$key]['日定额'] = '';
|
|
|
- }
|
|
|
+ $row = \db('dic_lzde')->where('sys_bh',$value['定额代号'])->field('rtrim(千件工价) as 千件工价,rtrim(日定额) as 日定额')->find();
|
|
|
+ $list[$key]['千件工价'] = $row['千件工价'];
|
|
|
+ $list[$key]['日定额'] = $row['日定额'];
|
|
|
$list[$key]['工序'] = $list[$key]['yjno'].'-'.$list[$key]['gxmc'];
|
|
|
$list[$key]['备注'] = $value['bzdh'].'('.$value['num'].')'.date('H:i',strtotime($value['sj1'])).'<-->'.date('H:i',strtotime($value['sj2']));
|
|
|
for ($i=1;$i<11;$i++){
|
