|
@@ -179,16 +179,22 @@ class JRFIDServerService extends Service
|
|
|
// ],
|
|
|
// 'completed_teams_group' => "",
|
|
|
// 'completed_teams_group_show' => "",
|
|
|
+// 'procedure_code' => [],
|
|
|
+// 'site' => ""
|
|
|
// ];dd(json_encode($p));
|
|
|
|
|
|
if(empty($data['screenDataList'])) return [false, '完工数据不能为空'];
|
|
|
+ if(empty($data['site'])) return [false, '站点信息不能为空'];
|
|
|
+
|
|
|
list($date,$utc_date) = $this->getE8AndUTC();
|
|
|
foreach ($data['screenDataList'] as $key => $value){
|
|
|
if(empty($value['id']) || ! isset($value['type'])) return [false, '完工数据不能为空'];
|
|
|
- $data['screenDataList'][$key]['completed_teams_group'] = $data['completed_teams_group'];
|
|
|
- $data['screenDataList'][$key]['completed_teams_group_show'] = $data['completed_teams_group_show'];
|
|
|
+ $data['screenDataList'][$key]['completed_teams_group'] = $data['completed_teams_group'] ?? "";
|
|
|
+ $data['screenDataList'][$key]['completed_teams_group_show'] = $data['completed_teams_group_show'] ?? "";
|
|
|
$data['screenDataList'][$key]['completed_date'] = $utc_date;
|
|
|
$data['screenDataList'][$key]['completed_date_lt'] = $date;
|
|
|
+ $data['screenDataList'][$key]['procedure_code'] = $data['procedure_code'] ?? [];
|
|
|
+ $data['screenDataList'][$key]['site'] = $data['site'] ?? "";
|
|
|
}
|
|
|
|
|
|
$url = config("j_rfid.completion_orders");
|
|
@@ -209,13 +215,17 @@ class JRFIDServerService extends Service
|
|
|
|
|
|
public function qualityOrders($data,$param){
|
|
|
if(empty($data['screenDataList'])) return [false, '质检数据不能为空'];
|
|
|
+ if(empty($data['site'])) return [false, '站点信息不能为空'];
|
|
|
+
|
|
|
list($date,$utc_date) = $this->getE8AndUTC();
|
|
|
foreach ($data['screenDataList'] as $key => $value){
|
|
|
if(empty($value['id']) || ! isset($value['type'])) return [false, '质检数据不能为空'];
|
|
|
- $data['screenDataList'][$key]['qualified_teams_group'] = $data['qualified_teams_group'];
|
|
|
- $data['screenDataList'][$key]['qualified_teams_group_show'] = $data['qualified_teams_group_show'];
|
|
|
+ $data['screenDataList'][$key]['qualified_teams_group'] = $data['qualified_teams_group'] ?? "";
|
|
|
+ $data['screenDataList'][$key]['qualified_teams_group_show'] = $data['qualified_teams_group_show'] ?? "";
|
|
|
$data['screenDataList'][$key]['qualified_date'] = $utc_date;
|
|
|
$data['screenDataList'][$key]['qualified_date_lt'] = $date;
|
|
|
+ $data['screenDataList'][$key]['procedure_code'] = $data['procedure_code'] ?? [];
|
|
|
+ $data['screenDataList'][$key]['site'] = $data['site'] ?? "";
|
|
|
}
|
|
|
|
|
|
$url = config("j_rfid.quality_orders");
|