接口对接

app/Service/JRFIDServerService.php

@@ -1099,7 +1099,7 @@ 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']) || ! empty($data['region']) || ! empty($data['room']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
+        if(! empty($data['drawing_no']) || ! empty($data['contract_no']) || ! empty($data['region']) || ! empty($data['room_no']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
             $rules = [];
             if(! empty($data['drawing_no'])) {
                 $rules[] = [
@@ -1122,11 +1122,11 @@ class JRFIDServerService extends Service
                     'values' => $data['region']
                 ];
             }
-            if(! empty($data['room'])) {
+            if(! empty($data['room_no'])) {
                 $rules[] = [
                     'field' => 'exe_sep_order_dtl_b.room',
                     'option' => 'IN',
-                    'values' => $data['room']
+                    'values' => $data['room_no']
                 ];
             }
             if(! empty($data['assembly_name'])) {
@@ -1169,7 +1169,7 @@ class JRFIDServerService extends Service
         $header = array_merge($param['header'], ['site:'. $data['site']]);
         $url = config("j_rfid.furnSeparateOrderDtCompList");
 
-        if(! empty($data['drawing_no']) || ! empty($data['contract_no']) || ! empty($data['region']) || ! empty($data['room']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
+        if(! empty($data['drawing_no']) || ! empty($data['contract_no']) || ! empty($data['region']) || ! empty($data['room_no']) || ! empty($data['assembly_name']) || ! empty($data['component'])) {
             $rules = [];
             if(! empty($data['drawing_no'])) {
                 $rules[] = [
@@ -1192,11 +1192,11 @@ class JRFIDServerService extends Service
                     'values' => $data['region']
                 ];
             }
-            if(! empty($data['room'])) {
+            if(! empty($data['room_no'])) {
                 $rules[] = [
                     'field' => 'furn_sep_order_dt_assem.room',
                     'option' => 'IN',
-                    'values' => $data['room']
+                    'values' => $data['room_no']
                 ];
             }
             if(! empty($data['assembly_name'])) {
@@ -1280,6 +1280,7 @@ class JRFIDServerService extends Service
         if(! empty($data['room_no'])) $post['room_no'] = $data['room_no'];
         if(! empty($data['assembly_name'])) $post['assembly_name'] = $data['assembly_name'];
         if(! empty($data['component'])) $post['component'] = $data['component'];
+        if(! empty($data['send_no'])) $post['send_no'] = $data['send_no'];
 
         $post['type'] = $data['type'];
         $post['site'] = $data['site'];