|
@@ -405,13 +405,13 @@ class Version extends BaseController
|
|
|
if ($pro) {
|
|
|
|
|
|
ActionLog::logAdd(['id'=>0,"nickname"=>'客户'], [
|
|
|
- "order_code" => $project,//项目编码
|
|
|
+ "order_code" => $pr['projectNo'],//项目编码
|
|
|
"status" =>4,//这里的status是之前的值
|
|
|
"action_remark" => '',//备注
|
|
|
"action_type" => "edit"//新建create,编辑edit更改状态status
|
|
|
], "PRO", 5, ["status" => 5, "updatetime" => date("Y-m-d H:i:s")]);
|
|
|
|
|
|
- $process = ["order_code" => $project, "order_id" => $pr['id'], "order_status" =>5, "order_type" => 'PRO',"before_status"=> $pr['status']];
|
|
|
+ $process = ["order_code" => $pr['projectNo'], "order_id" => $pr['id'], "order_status" =>5, "order_type" => 'PRO',"before_status"=> $pr['status']];
|
|
|
ProcessOrder::AddProcess(['id'=>0,"nickname"=>'客户'], $process);
|
|
|
Db::commit();
|
|
|
return app_show(0, "方案数据修改成功");
|
|
@@ -421,7 +421,7 @@ class Version extends BaseController
|
|
|
return error_show(1004,"方案选择失败");
|
|
|
}catch (\Exception $e){
|
|
|
Db::rollback();
|
|
|
- return error_show(1004,$e->getMessage());
|
|
|
+ return error_show(1004,$e->getMessage()."|".$e->getLine());
|
|
|
}
|
|
|
|
|
|
}
|