Browse Source

接口对接

cqpCow 10 months ago
parent
commit
f5af2a4983
2 changed files with 7 additions and 14 deletions
  1. 6 13
      app/Service/JRFIDServerService.php
  2. 1 1
      config/j_rfid.php

+ 6 - 13
app/Service/JRFIDServerService.php

@@ -2,8 +2,6 @@
 
 namespace App\Service;
 
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Redis;
 
 class JRFIDServerService extends Service
 {
@@ -73,7 +71,7 @@ class JRFIDServerService extends Service
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
-        return [true, $result];
+        return [true, $result['data']];
     }
 
     public function getProduceByContract($data,$param){
@@ -91,7 +89,7 @@ class JRFIDServerService extends Service
 
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['msg']];
 
-        return [true, $result];
+        return [true, $result['data']];
     }
 
     public function getPrintData($data){
@@ -233,7 +231,7 @@ class JRFIDServerService extends Service
     public function screenPrint($data){
         if(empty($data['id'])) return [false, '数据ID不能为空'];
         if(empty($data['type'])) return [false, 'TYPE不能为空'];
-        if(empty($data['print_type'])) return [false, 'PRINTTYPE不能为空'];
+        if(! isset($data['print_type'])) return [false, 'PRINTTYPE不能为空'];
 
         $rsaService = new RsaEncryptionService();
         $dataToEncrypt = [
@@ -254,12 +252,7 @@ class JRFIDServerService extends Service
         if(! empty($result['status']) && $result['status'] == 'error') return [false, $result['message']];
         if(! empty($result['type']) && $result['type'] == 'errorVm') return [false, $result['message']];
 
-        if(! isset($result['furn_pro_flow_dt_a'])) {
-            $error = $result[0]['message'] ?? "操作失败,请刷新页面";
-            return [false, $error];
-        }
-
-        return [true, $result];
+        return [true, ''];
     }
 
     public function getE8AndUTC(){
@@ -364,7 +357,7 @@ class JRFIDServerService extends Service
             return [false, $error];
         }
 
-        return [true, $result['data']];
+        return [true, ''];
     }
 
     public function screenPackage($data,$param){
@@ -396,7 +389,7 @@ class JRFIDServerService extends Service
             return [false, $error];
         }
 
-        return [true, $result['data']];
+        return [true, ''];
     }
 
     public function screenGetPackageData($data,$param){

+ 1 - 1
config/j_rfid.php

@@ -30,7 +30,7 @@ return [
     //(根据合同号、图号、房间号查询工艺流程单数据)
     '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_send' => 'https://gzy.qingyaokeji.com/api/module-data/send_and_receipt/send_and_receipt/diy/screen_send',
     //包装
     'screen_package' => 'https://gzy.qingyaokeji.com/api/module-data/package/package/diy/screen_package',
     //(根据合同号、图号、房间号查询包装单数据)