|
@@ -4,6 +4,7 @@ namespace App\Service;
|
|
|
|
|
|
use App\Model\BasicProcess;
|
|
|
use App\Model\Process;
|
|
|
+use App\Model\Technology;
|
|
|
|
|
|
/**
|
|
|
* 工序相关
|
|
@@ -96,11 +97,11 @@ class ProcessService extends Service
|
|
|
$model = $model->where('id',$data['id'])->first();
|
|
|
$model->title = $data['title'];
|
|
|
$model->p_id = $data['p_id'];
|
|
|
- $model->time = $data['time'];
|
|
|
- $model->capacity = $data['capacity'];
|
|
|
- $model->wages_unit = $data['wages_unit'];
|
|
|
- $model->wages = $data['wages'];
|
|
|
- $model->team_id = $data['team_id'];
|
|
|
+ $model->time = $data['time'] ?? '';
|
|
|
+ $model->capacity = $data['capacity'] ?? '';
|
|
|
+ $model->wages_unit = $data['wages_unit'] ?? 0;
|
|
|
+ $model->wages = $data['wages'] ?? '';
|
|
|
+ $model->team_id = $data['team_id'] ?? 0;
|
|
|
$model->save();
|
|
|
|
|
|
return [true,'保存成功!'];
|
|
@@ -116,11 +117,11 @@ class ProcessService extends Service
|
|
|
|
|
|
$model->title = $data['title'];
|
|
|
$model->p_id = $data['p_id'];
|
|
|
- $model->time = $data['time'];
|
|
|
- $model->capacity = $data['capacity'];
|
|
|
- $model->wages_unit = $data['wages_unit'];
|
|
|
- $model->wages = $data['wages'];
|
|
|
- $model->team_id = $data['team_id'];
|
|
|
+ $model->time = $data['time'] ?? '';
|
|
|
+ $model->capacity = $data['capacity'] ?? '';
|
|
|
+ $model->wages_unit = $data['wages_unit'] ?? 0;
|
|
|
+ $model->wages = $data['wages'] ?? '';
|
|
|
+ $model->team_id = $data['team_id'] ?? '';
|
|
|
$model->save();
|
|
|
|
|
|
return [true,'保存成功!'];
|
|
@@ -129,6 +130,11 @@ class ProcessService extends Service
|
|
|
public function processDel($data){
|
|
|
if($this->isEmpty($data,'id')) return [false,'ID必须!'];
|
|
|
|
|
|
+ $bool = Technology::where('del_time',0)
|
|
|
+ ->whereRaw("find_in_set('{$data['id']}',process_id)")
|
|
|
+ ->exists();
|
|
|
+ if($bool) return [false, '工序已经绑定工艺路线!'];
|
|
|
+
|
|
|
Process::where('id',$data['id'])->update([
|
|
|
'del_time' => time()
|
|
|
]);
|