|
|
@@ -156,7 +156,7 @@ class MaterialService extends Service
|
|
|
$model->img_url = $data['img_url'] ?? '' ;
|
|
|
|
|
|
$model->save();
|
|
|
-
|
|
|
+ $time = time();
|
|
|
$detail_insert = [];
|
|
|
if(isset($data['detail'])){
|
|
|
foreach ($data['detail'] as $v){
|
|
|
@@ -168,6 +168,8 @@ class MaterialService extends Service
|
|
|
'high' => $v['high'],
|
|
|
'code' => $v['code'],
|
|
|
'brand' => $v['brand'],
|
|
|
+ 'upd_time' => $time,
|
|
|
+ 'crt_time' => $time,
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
@@ -209,7 +211,7 @@ class MaterialService extends Service
|
|
|
$id = $data['id'];
|
|
|
$detail = Material::where('del_time',0)->where('id',$id)->select('title','b_m_id','abbreviation_title','unit','crt_time','upd_time','id')->first();
|
|
|
if(empty($detail)) return [false,'数据不存在！'];
|
|
|
- $detail['detail'] = MaterialDetail::where('material_id',$id)->select('price','long','width','high','crt_time','upd_time','code','brand')->get()->toArray();
|
|
|
+ $detail['detail'] = MaterialDetail::where('material_id',$id)->where('del_time',0)->select('price','long','width','high','crt_time','upd_time','code','brand')->get()->toArray();
|
|
|
|
|
|
|
|
|
|
root