接口对接

app/Http/Controllers/Api/JRFIDController.php

@@ -16,6 +16,16 @@ class JRFIDController extends BaseController
         }
     }
 
+    public function getSite2(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->getSite2($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
     public function getFlowByProduce(Request $request){
         list($bool, $data) = (new JRFIDServerService())->getFlowByProduce($request->all(),$request->common_param);
 
@@ -85,4 +95,54 @@ class JRFIDController extends BaseController
             return $this->json_return(201,$data);
         }
     }
+
+    public function searchSales(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->searchSales($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function screenGetProFlow(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenGetProFlow($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function screenSend(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenSend($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function screenPackage(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenPackage($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+
+    public function screenGetPackageData(Request $request){
+        list($bool, $data) = (new JRFIDServerService())->screenGetPackageData($request->all(),$request->common_param);
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
 }

app/Http/Controllers/Api/TestController.php

@@ -2,72 +2,38 @@
 
 namespace App\Http\Controllers\Api;
 
-
-use App\Model\BoxDetail;
-use App\Service\Box\BoxHookService;
-use App\Service\DwyService;
-use App\Service\MeasureService;
+use App\Service\TestService;
 use Illuminate\Http\Request;
 
-
 class TestController extends BaseController
 {
-    public function deviceCallback(Request $request){
-        $a = DwyService::getInstance()->setBoxData(1,2,3,4,1);
+    public function testdwy(Request $request){
+        list($bool, $data) = (new TestService())->testdwy($request->all());
+
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
     }
 
+    public function testdwyget(Request $request){
+        list($bool, $data) = (new TestService())->testdwyget($request->all());
 
-    public function boxInsert(){
-        $data = [
-            'out_order_no' => 'test123',
-            'ext_1' => '1',
-            'ext_2' => '2',
-            'ext_3' => '3',
-            'ext_4' => '4',
-            'ext_5' => '5',
-            'detail' => [
-                [
-                    'top_id' => '1',
-                    'code' => '001',
-                    'title' => '产品名称',
-                    'ext_1' => '1',
-                    'ext_2' => '2',
-                    'ext_3' => '3',
-                    'ext_4' => '4',
-                    'ext_5' => '5',
-                ],[
-                    'top_id' => '2',
-                    'code' => '002',
-                    'title' => '产品名称1',
-                    'ext_1' => '11',
-                    'ext_2' => '22',
-                    'ext_3' => '33',
-                    'ext_4' => '44',
-                    'ext_5' => '55',
-                ],
-            ],
-        ];
-
-
-        $service = BoxHookService::getInstance();
-
-        list($status,$msg) = $service->boxInsert($data);
-        var_dump($status);
-        var_dump($msg);
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
     }
 
-    public function aa(){
-        $service = BoxHookService::getInstance();
+    public function testdwyput(Request $request){
+        list($bool, $data) = (new TestService())->testdwyput($request->all());
 
-        list($status,$msg) = $service->boxDetail(['order_no'=>'202306130543108902']);
-        var_dump($status);
-        var_dump($msg);
+        if($bool){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
     }
-
-
-
-
-
-
-
 }

app/Service/JRFIDServerService.php

@@ -47,6 +47,18 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function getSite2($data,$param){
+        $url = config("j_rfid.site2");
+
+        $header = ["Authorization: {$param['token']}"];
+        list($status,$result) = $this->get_helper($url,$header);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['errorMessage'])) return [false, $result['errorMessage']];
+
+        return [true, $result];
+    }
+
     public function getFlowByProduce($data,$param){
         if(empty($data['produce_no'])) return [false, '订单号不能为空'];
         if(empty($data['site'])) return [false, '站点不能为空'];
@@ -180,35 +192,77 @@ class JRFIDServerService extends Service
     }
 
     public function completionOrders($data,$param){
-        if(empty($data['exe_pro_flow_dtl_sub_c'])) return [false, '数据不能为空'];
+        //{"type":"","id":[],"completed_teams_group":"","completed_teams_group_show":"","completed_date":"","completed_date_lt":""}
+//        $p = [
+//            'screenDataList' =>[
+//                [
+//                    'id' => [], //产品
+//                    'type' => ''
+//                ],
+//                [
+//                    'id' => [],//组件
+//                    'type' => ''
+//                ],
+//                [
+//                    'id' => [],//部件
+//                    'type' => ''
+//                ],
+//            ],
+//            'completed_teams_group' => "",
+//            'completed_teams_group_show' => "",
+//        ];dd(json_encode($p));
+
+        if(empty($data['screenDataList'])) 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_date'] = $utc_date;
+            $data['screenDataList'][$key]['completed_date_lt'] = $date;
+        }
 
         $url = config("j_rfid.completion_orders");
-        $post['data'] = [
-            'exe_pro_flow_dtl_sub_c' => $data['exe_pro_flow_dtl_sub_c'],
+        $post = [
+            'screenDataList' => $data['screenDataList'],
         ];
 
         list($status,$result) = $this->post_helper($url,json_encode($post), $param['header']);
         if(! $status) return [false, $result];
 
-        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
 
-        return [true, $result];
+        return [true, ''];
     }
 
     public function qualityOrders($data,$param){
-        if(empty($data['exe_pro_flow_dtl_sub_c'])) return [false, '数据不能为空'];
+        if(empty($data['screenDataList'])) 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_date'] = $utc_date;
+            $data['screenDataList'][$key]['qualified_date_lt'] = $date;
+        }
 
         $url = config("j_rfid.quality_orders");
-        $post['data'] = [
-            'exe_pro_flow_dtl_sub_c' => $data['exe_pro_flow_dtl_sub_c'],
+        $post = [
+            'screenDataList' => $data['screenDataList'],
         ];
 
         list($status,$result) = $this->post_helper($url,json_encode($post), $param['header']);
         if(! $status) return [false, $result];
 
-        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
 
-        return [true, $result];
+        return [true, ''];
     }
 
     public function screenPrint($data){
@@ -238,8 +292,173 @@ class JRFIDServerService extends Service
         return [true, $result];
     }
 
+    public function getE8AndUTC(){
+        $eastEightTimeZone = new \DateTimeZone('Asia/Shanghai'); // 东八区时区
+        $utcTimeZone = new \DateTimeZone('UTC'); // UTC时区
+
+        // 假设的东八区时间，没有毫秒部分
+        $dateTimeString = date("Y-m-d H:i:s");
+        $milliseconds = '000'; // 假设的毫秒值
+
+        // 创建DateTime对象并设置时区为东八区
+        $dateTime = new \DateTime($dateTimeString, $eastEightTimeZone);
+
+        // 将DateTime对象转换为UTC时区
+        $dateTime->setTimezone($utcTimeZone);
+
+        // 格式化DateTime对象为ISO 8601格式，并添加毫秒部分
+        $formattedDate = $dateTime->format('Y-m-d\TH:i:s') . '.' . str_pad($milliseconds, 3, '0', STR_PAD_LEFT) . 'Z';
+
+        return [$dateTimeString,$formattedDate];
+    }
+
+    public function searchSales($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        if(empty($data['type'])) return [false, 'TYPE不能为空'];
+        $post['site'] = $data['site'];
+        $post['type'] = $data['type'];
+
+        $url = config("j_rfid.search_sales");
+        if(isset($data['contract_no'])) $post['contract_no'] = $data['contract_no'];
+        if(isset($data['room_no'])) $post['room_no'] = $data['room_no'];
+        if(isset($data['drawing_no'])) $post['drawing_no'] = $data['drawing_no'];
+        $post['size'] = $data['size'] ?? 10;
+        $post['number'] = $data['number'] ?? 1;
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['data']];
+    }
+
+    public function screenGetProFlow($data,$param){
+        if(empty($data['site'])) return [false, '站点不能为空'];
+        if(empty($data['contract_no'])) return [false, '合同不能为空'];
+        if(empty($data['drawing_no'])) return [false, '图号不能为空'];
+        if(empty($data['room_no'])) return [false, '房间号不能为空'];
+
+        $url = config("j_rfid.screen_get_pro_flow");
+        $post = [
+            'site' => $data['site'],
+            'contract_no' => $data['contract_no'],
+            'drawing_no' => $data['drawing_no'],
+            'room_no' => $data['room_no'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['data']];
+    }
+
+    public function screenSend($data,$param){
+        if(empty($data['screenDataList'])) return [false, '收发货数据不能为空'];
+        if(empty($data['site']) || empty($data['site_show'])) 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]['send_teams_group'] = $data['send_teams_group'];
+            $data['screenDataList'][$key]['send_teams_group_show'] = $data['send_teams_group_show'];
+            $data['screenDataList'][$key]['send_date'] = $utc_date;
+            $data['screenDataList'][$key]['send_date_lt'] = $date;
+            $data['screenDataList'][$key]['site'] = $data['site'];
+            $data['screenDataList'][$key]['site_show'] = $data['site_show'];
+        }
+
+        $url = config("j_rfid.screen_send");
+        $post = [
+            'screenDataList' => $data['screenDataList'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['data']];
+    }
+
+    public function screenPackage($data,$param){
+        if(empty($data['screenDataList'])) return [false, '包装数据不能为空'];
+        if(empty($data['site']) || empty($data['site_show'])) 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]['package_teams_group'] = $data['package_teams_group'];
+            $data['screenDataList'][$key]['package_teams_group_show'] = $data['package_teams_group_show'];
+            $data['screenDataList'][$key]['package_date'] = $utc_date;
+            $data['screenDataList'][$key]['package_date_lt'] = $date;
+            $data['screenDataList'][$key]['site'] = $data['site'];
+            $data['screenDataList'][$key]['site_show'] = $data['site_show'];
+        }
+
+        $url = config("j_rfid.screen_package");
+        $post = [
+            'screenDataList' => $data['screenDataList'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['data']];
+    }
+
+    public function screenGetPackageData($data,$param){
+        if(empty($data['site'])) return [false, '站点信息不能为空'];
+        if(empty($data['contract_no'])) return [false, '合同不能为空'];
+        if(empty($data['drawing_no'])) return [false, '图号不能为空'];
+        if(empty($data['room_no'])) return [false, '房间号不能为空'];
+
+        $url = config("j_rfid.screen_get_package_data");
+        $post = [
+            'site' => $data['site'],
+            'contract_no' => $data['contract_no'],
+            'drawing_no' => $data['drawing_no'],
+            'room_no' => $data['room_no'],
+        ];
+
+        list($status,$result) = $this->post_helper($url,json_encode($post),$param['header']);
+        if(! $status) return [false, $result];
+
+        if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
+
+        if(! isset($result['success'])) {
+            $error = $result[0]['message'] ?? "操作失败，请刷新页面";
+            return [false, $error];
+        }
+
+        return [true, $result['data']];
+    }
+
     public function post_helper($url, $data, $header = [], $timeout = 20){
-        file_put_contents('jrfid_record.txt',date('Y-m-d H:i:s') . PHP_EOL. "请求API:" . $url . PHP_EOL . "请求参数:" .  $data . PHP_EOL . "请求头部:" . json_encode($header) . PHP_EOL,8);
+        $file_name = 'record_' . date("Y-m-d") . '.txt';
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL. "请求API:" . $url . PHP_EOL . "请求参数:" .  $data . PHP_EOL . "请求头部:" . json_encode($header) . PHP_EOL,8);
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch,  CURLOPT_RETURNTRANSFER, true);
@@ -262,11 +481,12 @@ class JRFIDServerService extends Service
         }
         curl_close($ch);
 
-        file_put_contents('jrfid_record.txt',date('Y-m-d H:i:s') . PHP_EOL . "返回结果:" . $r . PHP_EOL,8);
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL . "返回结果:" . $r . PHP_EOL,8);
         return [true, json_decode($r, true)];
     }
 
     public function get_helper($url,$header=[],$timeout = 20){
+        $file_name = 'record_' . date("Y-m-d") . '.txt';
         $ch = curl_init();
         curl_setopt_array($ch, array(
             CURLOPT_URL => $url,
@@ -291,7 +511,7 @@ class JRFIDServerService extends Service
         }
 
         curl_close($ch);
-        file_put_contents('jrfid_record.txt',date('Y-m-d H:i:s') . PHP_EOL . "GET返回结果:" . $r . PHP_EOL,8);
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL . "GET返回结果:" . $r . PHP_EOL,8);
         return [true, json_decode($r, true)];
     }
 }

app/Service/TestService.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Service;
+
+class TestService extends Service
+{
+    public function testdwy($data){
+        if(empty($data['url']) || empty($data['post']) || empty($data['header'])) return [false,'API请求参数不能为空'];
+        $url = $data['url'];
+        $post = $data['post'];
+        $header = $data['header'];
+
+        $json = json_encode($post);
+        $json = str_replace('"workflowSearchBean":[]','"workflowSearchBean":{}',$json);
+        $json = str_replace('"loginBindingParameters":[]','"loginBindingParameters":{}',$json);
+
+        list($status, $result) = $this->post_helper($url,$json, $header);
+        if(! $status) return [false, $result];
+
+        return [true, $result];
+    }
+
+    public function testdwyget($data){
+        if(empty($data['url']) || empty($data['header'])) return [false,'API请求参数不能为空'];
+
+        $url = $data['url'];
+        $header = $data['header'];
+
+        list($status,$result) = $this->get_helper($url,$header);
+        if(! $status) return [false, $result];
+
+        return [true, $result];
+    }
+
+    public function testdwyput($data){
+        if(empty($data['url']) || empty($data['post']) || empty($data['header'])) return [false,'API请求参数不能为空'];
+
+        $url = $data['url'];
+        $post = $data['post'];
+        $header = $data['header'];
+
+        $json = json_encode($post);
+        $json = str_replace('"workflowSearchBean":{}','"workflowSearchBean":[]',json_encode($post));
+        $json = str_replace('"workflowSearchBean":[]','"workflowSearchBean":{}',json_encode($post));
+
+        list($status, $result) = $this->put_helper($url,$json, $header);
+        if(! $status) return [false, $result];
+
+        return [true, $result];
+    }
+
+    public function post_helper($url, $data, $header = [], $timeout = 20){
+        $file_name = 'record_test' . date("Y-m-d") . '.txt';
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL. "请求API:" . $url . PHP_EOL . "请求参数:" .  $data . PHP_EOL . "请求头部:" . json_encode($header) . PHP_EOL,8);
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch,  CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_ENCODING, '');
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+
+        if(!is_null($data)) curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        $r = curl_exec($ch);
+
+        if ($r === false) {
+            // 获取错误号
+            $errorNumber = curl_errno($ch);
+            // 获取错误信息
+            $errorMessage = curl_error($ch);
+            return [false, "cURL Error #{$errorNumber}: {$errorMessage}"];
+        }
+        curl_close($ch);
+
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL . "返回结果:" . $r . PHP_EOL,8);
+        return [true, json_decode($r, true)];
+    }
+
+    public function get_helper($url,$header=[],$timeout = 20){
+        $file_name = 'record_test' . date("Y-m-d") . '.txt';
+        $ch = curl_init();
+        curl_setopt_array($ch, array(
+            CURLOPT_URL => $url,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_ENCODING => '',
+            CURLOPT_MAXREDIRS => 10,
+            CURLOPT_TIMEOUT => $timeout,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+            CURLOPT_CUSTOMREQUEST => 'GET',
+            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_HTTPHEADER => $header,
+        ));
+        $r = curl_exec($ch);
+
+        if ($r === false) {
+            // 获取错误号
+            $errorNumber = curl_errno($ch);
+            // 获取错误信息
+            $errorMessage = curl_error($ch);
+            return [false, "cURL Error #{$errorNumber}: {$errorMessage}"];
+        }
+
+        curl_close($ch);
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL . "GET返回结果:" . $r . PHP_EOL,8);
+        return [true, json_decode($r, true)];
+    }
+
+    public function put_helper($url, $data, $header = [], $timeout = 20){
+        $file_name = 'record_test' . date("Y-m-d") . '.txt';
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL. "请求API:" . $url . PHP_EOL . "请求参数:" .  $data . PHP_EOL . "请求头部:" . json_encode($header) . PHP_EOL,8);
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch,  CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_ENCODING, '');
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+
+        if(!is_null($data)) curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        $r = curl_exec($ch);
+
+        if ($r === false) {
+            // 获取错误号
+            $errorNumber = curl_errno($ch);
+            // 获取错误信息
+            $errorMessage = curl_error($ch);
+            return [false, "cURL Error #{$errorNumber}: {$errorMessage}"];
+        }
+        curl_close($ch);
+
+        file_put_contents($file_name,date('Y-m-d H:i:s') . PHP_EOL . "返回结果:" . $r . PHP_EOL,8);
+        return [true, json_decode($r, true)];
+    }
+}

config/j_rfid.php

@@ -9,6 +9,8 @@ return [
     'login' => 'https://gzy.qingyaokeji.com/jbl/api/mes/login',
     //站点获取
     'site' => 'https://gzy.qingyaokeji.com/jbl/api/site/all/ignore-action?_allow_anonymous=true',
+    //站点获取 登录后的
+    'site2' => 'https://gzy.qingyaokeji.com/api/site/get-by-login',
     //工艺流程单查询
     'get_flow_by_produce' => 'https://gzy.qingyaokeji.com/api/module-data/process_flow/process_flow/diy/get_flow_by_produce',
     //生产订单查询接口
@@ -18,9 +20,19 @@ return [
     //班组查询
     'get_team' => 'https://gzy.qingyaokeji.com/api/module-data/teams_group_list/page',
     //完工
-    'completion_orders' => 'https://gzy.qingyaokeji.com/api/module-data/process_flow/process_flow/diy/completion_orders',
+    'completion_orders' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_completed',
     //质检
-    'quality_orders' => 'https://gzy.qingyaokeji.com/api/module-data/process_flow/process_flow/diy/quality_orders',
+    'quality_orders' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_quality',
     //打印
     'screen_print' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_print',
+    //（查询合同号、图号、房间号）
+    'search_sales' => 'https://gzy.qingyaokeji.com/api/module-data/sales_order/sales_order/diy/get_contract_draw_room',
+    //(根据合同号、图号、房间号查询工艺流程单数据)
+    'screen_get_pro_flow' => 'https://gzy.qingyaokeji.com/api/module-data/furn_process_flow_dt/process_flow_dt/diy/screen_get_pro_flow',
+    //收发货
+    'screen_send' => 'https://gzy.qingyaokeji.com/api/module-data/api/send_and_receipt/send_and_receipt/diy/screen_send',
+    //包装
+    'screen_package' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_package',
+    //(根据合同号、图号、房间号查询包装单数据)
+    'screen_get_package_data' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_get_package_data',
 ];

routes/api.php

@@ -23,7 +23,13 @@ Route::any('getSite', 'Api\JRFIDController@getSite');
 Route::any('getPrintData', 'Api\JRFIDController@getPrintData');
 Route::any('screenPrint', 'Api\JRFIDController@screenPrint');
 
+Route::any('testdwy','Api\TestController@testdwy');
+Route::any('testdwyget','Api\TestController@testdwyget');
+Route::any('testdwyput','Api\TestController@testdwyput');
+
 Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
+    //站点获取登录后
+    $route->any('getSiteByLogin', 'Api\JRFIDController@getSite2');
     //工艺流程单
     $route->any('getFlowByProduce', 'Api\JRFIDController@getFlowByProduce');
     //生产订单
@@ -34,4 +40,14 @@ Route::group(['middleware'=> ['CheckJRFIDLogin']],function ($route){
     $route->any('completionOrders', 'Api\JRFIDController@completionOrders');
     //质检
     $route->any('qualityOrders', 'Api\JRFIDController@qualityOrders');
+    //（查询合同号、图号、房间号）
+    $route->any('searchSales', 'Api\JRFIDController@searchSales');
+    //(根据合同号、图号、房间号查询工艺流程单数据)
+    $route->any('screenGetProFlow', 'Api\JRFIDController@screenGetProFlow');
+    //收发货
+    $route->any('screenSend', 'Api\JRFIDController@screenSend');
+    //包装
+    $route->any('screenPackage', 'Api\JRFIDController@screenPackage');
+    //(根据合同号、图号、房间号查询包装单数据)
+    $route->any('screenGetPackageData', 'Api\JRFIDController@screenGetPackageData');
 });