|
@@ -710,11 +710,11 @@ class Manufacture extends Api
|
|
|
if (Request::instance()->isPost() === false){
|
|
if (Request::instance()->isPost() === false){
|
|
|
$this->error('请求错误');
|
|
$this->error('请求错误');
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
$param = Request::instance()->post();
|
|
$param = Request::instance()->post();
|
|
|
if (empty($param)){
|
|
if (empty($param)){
|
|
|
$this->error('参数错误');
|
|
$this->error('参数错误');
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
$i = 0;
|
|
$i = 0;
|
|
|
foreach ($param as $key=>$value){
|
|
foreach ($param as $key=>$value){
|
|
|
$data = [
|
|
$data = [
|
|
@@ -725,7 +725,7 @@ class Manufacture extends Api
|
|
|
'工序备注' => $value['remark'],
|
|
'工序备注' => $value['remark'],
|
|
|
'Gy0_最早开工时间' => $value['start'] === ''?'1900-01-01 00:00:00':date('Y-m-d H:i:s',strtotime($value['start'])),
|
|
'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_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
|
|
|
- 'Gy0_sj2' => date('Y-m-d HY-m-d',strtotime(($value['projectTime'])+(ceil($value['ProductionHours'])+ceil($value['AuxiliaryHours']))*3600)),
|
|
|
|
|
|
|
+ 'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($param[0]['projectTime'])+(ceil($param[0]['ProductionHours'])+ceil($param[0]['AuxiliaryHours']))*3600),
|
|
|
];
|
|
];
|
|
|
$sql = \db('工单_工艺资料')
|
|
$sql = \db('工单_工艺资料')
|
|
|
->where('UniqId',$value['UniqId'])
|
|
->where('UniqId',$value['UniqId'])
|