|
@@ -413,7 +413,7 @@ class DeviceWorkService extends Service
|
|
|
DailyDwOrderDetails::where('del_time',0)
|
|
DailyDwOrderDetails::where('del_time',0)
|
|
|
->where('main_id', $model->id)
|
|
->where('main_id', $model->id)
|
|
|
->update(['del_time' => $time]);
|
|
->update(['del_time' => $time]);
|
|
|
- $this->saveDetailDaily($model->id, $time, $data);
|
|
|
|
|
|
|
+ $this->saveDetailDaily($model->id, $time, $data, $user);
|
|
|
|
|
|
|
|
DB::commit();
|
|
DB::commit();
|
|
|
}catch (\Exception $exception){
|
|
}catch (\Exception $exception){
|
|
@@ -443,7 +443,7 @@ class DeviceWorkService extends Service
|
|
|
$model->top_depart_id = $data['top_depart_id'];
|
|
$model->top_depart_id = $data['top_depart_id'];
|
|
|
$model->save();
|
|
$model->save();
|
|
|
|
|
|
|
|
- $this->saveDetailDaily($model->id, time(), $data);
|
|
|
|
|
|
|
+ $this->saveDetailDaily($model->id, time(), $data, $user);
|
|
|
|
|
|
|
|
DB::commit();
|
|
DB::commit();
|
|
|
}catch (\Exception $exception){
|
|
}catch (\Exception $exception){
|
|
@@ -454,7 +454,7 @@ class DeviceWorkService extends Service
|
|
|
return [true, ''];
|
|
return [true, ''];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private function saveDetailDaily($id, $time, $data){
|
|
|
|
|
|
|
+ private function saveDetailDaily($id, $time, $data, $user){
|
|
|
if(! empty($data['details'])){
|
|
if(! empty($data['details'])){
|
|
|
$unit = [];
|
|
$unit = [];
|
|
|
foreach ($data['details'] as $value){
|
|
foreach ($data['details'] as $value){
|
|
@@ -469,7 +469,8 @@ class DeviceWorkService extends Service
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
'top_depart_id' => $value['top_depart_id'],
|
|
'top_depart_id' => $value['top_depart_id'],
|
|
|
'order_time' => $data['order_time'] ?? 0,
|
|
'order_time' => $data['order_time'] ?? 0,
|
|
|
- 'item_id' => $data['item_id']
|
|
|
|
|
|
|
+ 'item_id' => $data['item_id'],
|
|
|
|
|
+ 'crt_id' => $user['id'],
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
if(! empty($unit)) DailyDwOrderDetails::insert($unit);
|
|
if(! empty($unit)) DailyDwOrderDetails::insert($unit);
|
|
@@ -1271,6 +1272,7 @@ class DeviceWorkService extends Service
|
|
|
'crt_time' => $now,
|
|
'crt_time' => $now,
|
|
|
'order_time' => $orderTimestamp,
|
|
'order_time' => $orderTimestamp,
|
|
|
'item_id' => $itemId,
|
|
'item_id' => $itemId,
|
|
|
|
|
+ 'crt_id' => $user['id'],
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
DB::table('daily_dw_order_details')->insert($insertDetails);
|
|
DB::table('daily_dw_order_details')->insert($insertDetails);
|