1

app/Http/Controllers/Api/DwyController.php

@@ -981,7 +981,9 @@ class DwyController extends BaseController
             'Authorization: ' . $token,
         ];
         $data = $this->post_helper($url, '{"device_code":"'.$mac.'"}', $header);
+//        var_dump($data);
         $data = json_decode($data, true);
+//        var_dump($data);die;
 //        if($mac == 'a6a672c3e458bed2'||$mac == 'DV00001'){
 //            usort($data, function ($a,$b){
 //                return str_replace('CK','',$a['box_code']) - str_replace('CK','',$b['box_code']);

app/Service/DwyService.php

@@ -10,7 +10,7 @@ namespace App\Service;
 class DwyService extends Service
 {
     private $url = 'https://tm.dwycloud.com';
-    private $url1 = 'https://tm.dwycloud.com';
+    private $url1 = 'http://122.112.196.99:7774';
 
     protected $num = 0;
 
@@ -106,7 +106,6 @@ class DwyService extends Service
 //        dd($old_data);die;
         //请求获取仓位卷码信息
         $box_roll_list = $this->getBoxData1($dv,$token,$box_list);
-//        var_dump($box_roll_list);die;
         $new_data = [];
         foreach ($data as $k=>$box_detail){
             foreach ($box_detail['detail'] as $v){
@@ -134,6 +133,8 @@ class DwyService extends Service
         }else{
             list($lind_bind,$lead_out) = $this->setNewData2($old_data,$new_data);
         }
+//        var_dump($lind_bind);
+//        var_dump($lead_out);die;
 //
         //把数据拼回去
 //        var_dump($data);die;
@@ -390,6 +391,8 @@ class DwyService extends Service
 
         //为了取商标卷码
         $res = $this->post_helper($this->url1.'/jbl/api/module-data/device/device/diy/device_code',['device_code'=>$dv],$token);
+//        var_dump($this->url1);
+//        var_dump($res);die;
         $res = json_decode($res,true);
         $detail = [];
         $qr_codes = [];

app/Service/LabelDealService.php

@@ -54,6 +54,26 @@ class LabelDealService extends Service
 
         if(isset($return_bind['status']) && $return_bind['status'] == 'success' && isset($return_out['status']) && $return_out['status'] == 'success') BigKingCbj::where('id',$id)->update(['is_successful' => 1]);
     }
+    public function boxOut1($lead_bind,$lead_out,$token,$id)
+    {
+        //商标出库
+        $url = 'http://122.112.196.99:7774/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind_out_stock';
+//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/11';
+        $return_out = $this->post_helper($url, $lead_out, $token);
+        $return_out = json_decode($return_out, true);
+        Log::channel('apiLog')->info('商标出库(返回结果)', ["message" => $return_out]);
+
+        sleep(3);
+
+        //商标绑定
+//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/1';
+        $url = 'http://122.112.196.99:7774/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind';
+        $return_bind = $this->post_helper($url, $lead_bind, $token);
+        $return_bind = json_decode($return_bind, true);
+        Log::channel('apiLog')->info('商标绑定(返回结果)', ["message" => $return_bind]);
+
+        if(isset($return_bind['status']) && $return_bind['status'] == 'success' && isset($return_out['status']) && $return_out['status'] == 'success') BigKingCbj::where('id',$id)->update(['is_successful' => 1]);
+    }
 
     public function post_helper($url, $data, $auth)
     {

routes/api.php

@@ -57,7 +57,7 @@ Route::any('deviceChart', 'Api\ScreenController@deviceChart');
 Route::any('inout', 'Api\ScreenController@inout');
 Route::any('upInout', 'Api\ScreenController@upInout');
 Route::any('gzEchart', 'Api\ScreenController@gzEchart');
-Route::any('t', 'Api\ScreenController@t');
+Route::any('aa', 'Api\TestController@aa');
 Route::any('deviceCallback', 'Api\TestController@deviceCallback');
 Route::any('advertisement', 'Api\DwyController@advertisement');
 Route::any('zjlb', 'Api\DwyController@zjlb');