|
|
@@ -728,7 +728,7 @@ class Manufacture extends Api
|
|
|
'工序备注' => $value['remark'],
|
|
|
'Gy0_最早开工时间' => $value['start'] === ''?'1900-01-01 00:00:00':date('Y-m-d H:i:s',strtotime($value['start'])),
|
|
|
'Gy0_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
|
|
|
- 'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['endTime'])),
|
|
|
+ 'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600),
|
|
|
];
|
|
|
$sql = \db('工单_工艺资料')
|
|
|
->where('UniqId',$value['UniqId'])
|
