接口对接

app/Http/Controllers/Api/JRFIDController.php

@@ -313,4 +313,26 @@ class JRFIDController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function sendAndReceiptList(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->sendAndReceiptList($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            if($bool === 0) return $this->json_return(401,$data);
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function sendOrderDtAssemList(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->sendOrderDtAssemList($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            if($bool === 0) return $this->json_return(401,$data);
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Service/JRFIDServerService.php

@@ -635,10 +635,10 @@ class JRFIDServerService extends Service
         list($date,$utc_date) = $this->getE8AndUTC();
         foreach ($data['screenDataList'] as $key => $value){
             if(empty($value['id']) || ! isset($value['type'])) return [false, '发货数据不能为空'];
-            $data['screenDataList'][$key]['delivery_teams_group'] = $data['delivery_teams_group'];
-            $data['screenDataList'][$key]['delivery_teams_group_show'] = $data['delivery_teams_group_show'];
-            $data['screenDataList'][$key]['delivery_date'] = $utc_date;
-            $data['screenDataList'][$key]['delivery_date_lt'] = $date;
+//            $data['screenDataList'][$key]['delivery_teams_group'] = $data['delivery_teams_group'];
+//            $data['screenDataList'][$key]['delivery_teams_group_show'] = $data['delivery_teams_group_show'];
+            $data['screenDataList'][$key]['receipt_date'] = $utc_date;
+            $data['screenDataList'][$key]['receipt_date_lt'] = $date;
             $data['screenDataList'][$key]['site'] = $data['site'];
             $data['screenDataList'][$key]['site_show'] = $data['site_show'];
         }
@@ -910,6 +910,95 @@ class JRFIDServerService extends Service
         return [true, ['box_no' => $result['data'] ?? [], 'package_date' => $date]];
     }
 
+    public function sendAndReceiptList($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.sendAndReceiptList");
+
+        if(! empty($data['contract_no']) || ! empty($data['no'])) {
+            $rules = [];
+            if(! empty($data['contract_no'])) {
+                $rules[] = [
+                    'field' => 'contract_no',
+                    'option' => 'IN',
+                    'values' => $data['contract_no']
+                ];
+            }
+            if(! empty($data['no'])) {
+                $rules[] = [
+                    'field' => 'no',
+                    'option' => 'LIKE_ANYWHERE',
+                    'values' => $data['no']
+                ];
+            }
+            $post['rules'] = $rules;
+        }
+
+        $post['size'] = $data['size'] ?? 10;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+
+        list($status,$result) = $this->post_helper($url,$post,$header);
+        if(! $status) return [$status, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['content'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result];
+    }
+
+    public function sendOrderDtAssemList($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        $header = array_merge($param['header'], ['site:'. $data['site']]);
+        $url = config("j_rfid.sendOrderDtAssemList");
+
+        if(! empty($data['send_id']) || ! empty($data['sep_dt_assem_id']) || ! empty($data['contract_no'])) {
+            $rules = [];
+            if(! empty($data['send_id'])) {
+                $rules[] = [
+                    'field' => 'furn_send_prod_dt.send_id',
+                    'option' => 'IN',
+                    'values' => $data['send_id']
+                ];
+            }
+            if(! empty($data['sep_dt_assem_id'])) {
+                $rules[] = [
+                    'field' => 'sep_dt_assem_id',
+                    'option' => 'IN',
+                    'values' => $data['sep_dt_assem_id']
+                ];
+            }
+            if(! empty($data['contract_no'])) {
+                $rules[] = [
+                    'field' => 'furn_send_prod_dt.contract_no',
+                    'option' => 'NOT_IN',
+                    'values' => $data['contract_no']
+                ];
+            }
+            $post['rules'] = $rules;
+        }
+
+        $post['size'] = $data['size'] ?? 10;
+        $post['number'] = ($data['number'] ?? 1) - 1;
+
+        list($status,$result) = $this->post_helper($url,$post,$header);
+        if(! $status) return [$status, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+        if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
+
+        if(! isset($result['content'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result];
+    }
+
     public function post_helper($url, $data, $header = [], $timeout = 20){
         Log::channel('apiLog')->info('工装云POST', ["api" => $url , "param" => $data ,"header" => $header]);
 

config/j_rfid.php

@@ -63,4 +63,8 @@ return [
     'screenGetPackageAssemData' => 'https://gzy.qingyaokeji.com/api/module-data/furn_package_dt/furn_package_dt/diy/screen_get_package_assem_data',
     //工位屏-保存收货单
     'screenReceipt' => 'https://gzy.qingyaokeji.com/api/module-data/furn_receipt_order/furn_receipt_order/diy/screen_receipt',
+    //发货单查询列表
+    'sendAndReceiptList' => 'https://gzy.qingyaokeji.com/api/module-data/send_and_receipt_list/page',
+    //发货单详情组件列表
+    'sendOrderDtAssemList' => 'https://gzy.qingyaokeji.com/api/module-data/send_order_dt_assem_list/page',
 ];

routes/api.php

@@ -78,4 +78,8 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('screenPackageBySepAssem', 'Api\JRFIDController@screenPackageBySepAssem');
     //工位屏-根据芯片查询包装单组件数据
     $route->any('screenGetPackageAssemData', 'Api\JRFIDController@screenGetPackageAssemData');
+    //发货单查询列表
+    $route->any('sendAndReceiptList', 'Api\JRFIDController@sendAndReceiptList');
+    //发货单详情组件列表
+    $route->any('sendOrderDtAssemList', 'Api\JRFIDController@sendOrderDtAssemList');
 });