|
|
@@ -87,7 +87,7 @@ class IssueWorkLogic extends BaseLogic
|
|
|
$returnModel = ReturnWork::where('issue_work_id', $params['id'])->findOrEmpty();
|
|
|
if($params['issue_approval'] == 4) {
|
|
|
if(!$returnModel->isEmpty() && $returnModel->return_work_status != 4){
|
|
|
- throw new \Exception("返修工单编号：".$returnModel->work_sn.'未返修完成');
|
|
|
+ //throw new \Exception("返修工单编号：".$returnModel->work_sn.'未返修完成');
|
|
|
}
|
|
|
}
|
|
|
$issueWork = IssueWork::where('id', $params['id'])->findOrEmpty();
|
|
|
@@ -129,7 +129,7 @@ class IssueWorkLogic extends BaseLogic
|
|
|
$work = ReturnWork::where('issue_work_id',$issueWork->id)->findOrEmpty();
|
|
|
if(!$work->isEmpty()){
|
|
|
// 最新师傅
|
|
|
- if($issueWork->master_worker_id != $work->master_worker_id){
|
|
|
+ if($issueWork->master_worker_id != $work->master_worker_id && $work->return_work_status == 4){
|
|
|
// 加账户余额 收益
|
|
|
$change_amount = MasterWorkerAccountLog::where([
|
|
|
'change_object'=>WorkerAccountLogEnum::UM,'change_type'=>WorkerAccountLogEnum::UM_INC_ADMIN,
|
|
|
@@ -148,7 +148,7 @@ class IssueWorkLogic extends BaseLogic
|
|
|
'to_freeze'=>2,
|
|
|
'source'=>1,
|
|
|
'remark'=>'对原工程师的质保金解冻质保金/清零',
|
|
|
- 'work_id'=>$work->service_work_id,'worker_id'=>$issueWork->master_worker_id,
|
|
|
+ 'work_id'=>$issueWork->service_work_id,'worker_id'=>$issueWork->master_worker_id,
|
|
|
'issue_work_id'=>$issueWork->id,
|
|
|
'amount'=>$amount,
|
|
|
],$is_zero);
|
liugc