|
|
@@ -282,11 +282,11 @@ class FinishedOrderService extends Service
|
|
|
'crt_time' => $time,
|
|
|
'scrapp_num' => $v,
|
|
|
'scrapp_id' => $k,
|
|
|
- 'team_id' => $value['team_id'],
|
|
|
- 'finished_id' => $value['finish_id'],
|
|
|
- 'equipment_id' => $value['device_id'],
|
|
|
+ 'team_id' => $value['team_id'] ?? 0,
|
|
|
+ 'finished_id' => $value['finish_id'] ?? 0,
|
|
|
+ 'equipment_id' => $value['device_id'] ?? 0,
|
|
|
'order_number' => $value['id'] . $time . $value['process_id'],
|
|
|
- 'process_id' => $value['process_id'],
|
|
|
+ 'process_id' => $value['process_id'] ?? 0,
|
|
|
'quantity' => $value['quantity'],
|
|
|
];
|
|
|
}
|
|
|
@@ -303,9 +303,9 @@ class FinishedOrderService extends Service
|
|
|
->update([
|
|
|
'finished_time' => $time,
|
|
|
'status' => 2,
|
|
|
- 'finished_id' => $value['finish_id'],
|
|
|
- 'team_id' => $value['team_id'],
|
|
|
- 'equipment_id' => $value['device_id'],
|
|
|
+ 'finished_id' => $value['finish_id'] ?? 0,
|
|
|
+ 'team_id' => $value['team_id'] ?? 0,
|
|
|
+ 'equipment_id' => $value['device_id'] ?? 0,
|
|
|
]);
|
|
|
|
|
|
if(! empty($insert_waste)) $process_model->insert($insert_waste);
|
|
|
@@ -1086,9 +1086,9 @@ class FinishedOrderService extends Service
|
|
|
->update([
|
|
|
'finished_time' => $time,
|
|
|
'status' => 2,
|
|
|
- 'finished_id' => $d['finished_id'],
|
|
|
- 'team_id' => $d['team_id'],
|
|
|
- 'equipment_id' => $d['equipment_id']
|
|
|
+ 'finished_id' => $d['finished_id'] ?? 0,
|
|
|
+ 'team_id' => $d['team_id'] ?? 0,
|
|
|
+ 'equipment_id' => $d['equipment_id'] ?? 0
|
|
|
]);
|
|
|
|
|
|
if(! empty($d['waste'])){
|
|
|
@@ -1105,9 +1105,9 @@ class FinishedOrderService extends Service
|
|
|
'dispatch_no' => $value['dispatch_no'],
|
|
|
'status' => 4,
|
|
|
'team_id' => $d['team_id'],
|
|
|
- 'finished_id' => $d['finished_id'],
|
|
|
- 'equipment_id' => $d['equipment_id'],
|
|
|
- 'scrapp_id' => $v['scrapp_id']
|
|
|
+ 'finished_id' => $d['finished_id'] ?? 0,
|
|
|
+ 'equipment_id' => $d['equipment_id'] ?? 0,
|
|
|
+ 'scrapp_id' => $v['scrapp_id'] ?? 0
|
|
|
];
|
|
|
$insert_dispatch[] = [
|
|
|
'order_product_id' => $value['order_product_id'],
|
