接口对接

app/Service/JRFIDServerService.php

@@ -1091,7 +1091,7 @@ class JRFIDServerService extends Service
             return [false, $error];
         }
 
-        return [true, $result['furn_sep_order_dt_assem_list']];
+        return [true, $result];
     }
 
     public function furnSeparateOrderCompList($data,$param){
@@ -1099,22 +1099,51 @@ class JRFIDServerService extends Service
         $header = array_merge($param['header'], ['site:'. $data['site']]);
         $url = config("j_rfid.furnSeparateOrderCompList");
 
-        if(! empty($data['drawing_no']) || ! empty($data['contract_no'])) {
+        if(! empty($data['drawing_no']) || ! empty($data['contract_no']) || ! empty($data['region']) || ! empty($data['room']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
             $rules = [];
             if(! empty($data['drawing_no'])) {
                 $rules[] = [
-                    'field' => 'drawing_no',
+                    'field' => 'exe_sep_order_a.contact_no',
                     'option' => 'IN',
                     'values' => $data['drawing_no']
                 ];
             }
             if(! empty($data['contract_no'])) {
                 $rules[] = [
-                    'field' => 'contract_no',
+                    'field' => 'exe_sep_order_a.drawing_no',
                     'option' => 'IN',
                     'values' => $data['contract_no']
                 ];
             }
+            if(! empty($data['region'])) {
+                $rules[] = [
+                    'field' => 'exe_sep_order_a.region',
+                    'option' => 'IN',
+                    'values' => $data['region']
+                ];
+            }
+            if(! empty($data['room'])) {
+                $rules[] = [
+                    'field' => 'exe_sep_order_dtl_b.room',
+                    'option' => 'IN',
+                    'values' => $data['room']
+                ];
+            }
+            if(! empty($data['assembly_name'])) {
+                $rules[] = [
+                    'field' => 'exe_sep_order_dtl_b.assembly_name',
+                    'option' => 'IN',
+                    'values' => $data['assembly_name']
+                ];
+            }
+            if(! empty($data['component'])) {
+                $rules[] = [
+                    'field' => 'component',
+                    'option' => 'IN',
+                    'values' => $data['component']
+                ];
+            }
+
             $post['rules'] = $rules;
         }