瀏覽代碼

出标机

cqpCow 11 月之前
父節點
當前提交
648ad61bc9
共有 2 個文件被更改,包括 24 次插入28 次删除
  1. 16 16
      app/Jobs/LabelDealJob.php
  2. 8 12
      app/Service/LabelDealService.php

+ 16 - 16
app/Jobs/LabelDealJob.php

@@ -32,24 +32,24 @@ class LabelDealJob implements ShouldQueue
         $this->id = $id;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $data = $this->data;
-        $dv = $data['key'];
-        $return = $box_list = [];
-        //处理数据
-        LabelDealService::getInstance()->clearData($data,$return,$box_list);
-
-        //调用外部方法
-        list($lead_bind,$lead_out) = DwyService::getInstance()->setBoxData($this->header,$dv,$return,$box_list,$data);
-
-        //调用保存接口
-        LabelDealService::getInstance()->boxOut($lead_bind,$lead_out,$this->header,$this->id);
+        try {
+            $data = $this->data;
+            $dv = $data['key'];
+            $return = $box_list = [];
+            //处理数据
+            LabelDealService::getInstance()->clearData($data,$return,$box_list);
+
+            //调用外部方法
+            list($lead_bind,$lead_out) = DwyService::getInstance()->setBoxData($this->header,$dv,$return,$box_list,$data);
+
+            //调用保存接口
+            LabelDealService::getInstance()->boxOut($lead_bind,$lead_out,$this->header,$this->id);
+        }catch (\Throwable $exception){
+            echo $exception;
+            $this->delete();
+        }
     }
 
     protected function echoMessage(OutputInterface $output)

+ 8 - 12
app/Service/LabelDealService.php

@@ -19,7 +19,7 @@ class LabelDealService extends Service
         if( empty($data['lead_out']) || empty($data['lead_out']['brand_out_stock_list'])) return;
 
         foreach ($data['lead_out']['brand_out_stock_list'] as $value){
-            $tmp = $value['brand_out_stock_dtl'];
+            $tmp = $value['brand_out_stock_dtl'][0] ?? [];
             $return[$value['send_box_code']] = [
                 'fake_qty' => $tmp['fake_qty'],
                 'detail' => explode(',',$tmp['brand_qr_code_list'])
@@ -31,20 +31,16 @@ class LabelDealService extends Service
     public function boxOut($lead_bind,$lead_out,$token,$id)
     {
         //商标绑定
-        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/1';
-//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind';
-        $header = [
-            'Content-Type:application/json',
-            'Authorization: ' . $token,
-        ];
-        $return_bind = $this->post_helper($url, json_encode($lead_bind), $header);
+//        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/1';
+        $url = 'https://tm.dwycloud.com/jbl/api/module-data/brand_in_stock/brand_in_stock/diy/lead_bind';
+        $return_bind = $this->post_helper($url, json_encode($lead_bind), $token);
         file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "绑定:" . $return_bind. PHP_EOL,8);
         $return_bind = json_decode($return_bind, true);
 
         //商标出库
-//        $url = 'https://tm.dwycloud.com/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, json_encode($lead_out), $header);
+        $url = 'https://tm.dwycloud.com/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, json_encode($lead_out), $token);
         file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "出库:" . $return_out. PHP_EOL,8);
         $return_out = json_decode($return_out, true);
 
@@ -66,7 +62,7 @@ class LabelDealService extends Service
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        if (!is_null($data)) curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+        if (!is_null($data)) curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
         $r = curl_exec($ch);
         curl_close($ch);
         return $r;