出标机 领标增加限制

app/Http/Controllers/Api/DwyController.php

@@ -648,8 +648,7 @@ class DwyController extends BaseController
     {
         $param = $request->all();
         file_put_contents('dwy.txt', json_encode($param) . PHP_EOL, 8);
-        list($status,$msg) = DwyService::getInstance()->setLimitForBoxOut($param);
-        if(! $status) return ['status' => '201', 'data' => [],'msg'=> $msg];
+
 
 //        $param = [
 //            'token'=>'Bearer eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIyNzM2OTUyNTA3NTI5NTQzNzMiLCJhdXRoIjoiUk9MRV9JTk5FUl9VU0VSLFJPTEVfQlJBTkRfQVJSRVNULFJPTEVfQURNSU4iLCJ0b2tlbklkIjoiOTUwIiwiZXhwIjoxNzA3OTcxMTcxfQ.2VQ9Wqmk4rvKAcTsQPw59llBbeXjalKDGIZA4kesnuOJ0POmPVOVlRLbTtUDxl0XiFdPDUrKzuEFl2DXSgQdJg',
@@ -781,6 +780,10 @@ class DwyController extends BaseController
         usort($data, function ($a,$b){
             return str_replace('CK','',$a['box_code']) - str_replace('CK','',$b['box_code']);
         });
+
+        list($status,$msg) = DwyService::getInstance()->setLimitForBoxOut($param);
+        if(! $status) return ['status' => '201', 'data' => [],'msg'=> $msg];
+
         return ['status' => '200', 'data' => $data];
     }
 

app/Jobs/LabelDealJob.php

@@ -51,7 +51,7 @@ class LabelDealJob implements ShouldQueue
             //调用保存接口
             LabelDealService::getInstance()->boxOut($lead_bind,$lead_out,$this->header,$this->id);
         }catch (\Throwable $exception){
-            file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "队列捕获：" . $exception->getLine() . "|" . $exception->getMessage(). "|"  . $exception->getCode(). PHP_EOL,8);
+            file_put_contents('msg_result.txt',date('Y-m-d H:i:s') . "队列捕获：" . $exception->getFile() . "|" . $exception->getLine() . "|" . $exception->getMessage(). "|"  . $exception->getCode(). PHP_EOL,8);
             $this->delete();
         }
     }

app/Service/DwyService.php

@@ -293,7 +293,7 @@ class DwyService extends Service
         if(empty($data['token']) || empty($data['list']) || empty($data['mac'])) return [false, '缺少必要参数,操作失败'];
 
         foreach ($data['list'] as $value){
-            $key = $data['mac'] . $value['order_item_id'] . hash('md5', $value['title']);
+            $key = $value['order_item_id'] . hash('md5', $value['title']);
             $bool = $this->limitingSendRequestBackg($key, $value['num'], 3600);
             if(! $bool) return [false, '同一产品相同商标限制同时操作，请稍后操作！'];
         }
@@ -303,10 +303,10 @@ class DwyService extends Service
 
     //删除限制领标
     public function delLimitForBoxOut($data){
-        if(empty($data['device_code']) || empty($data['material_list'])) return ;
+        if(empty($data['material_list'])) return ;
 
         foreach ($data['material_list'] as $value){
-            $key = $data['device_code'] . $value['order_item_id'] . hash('md5', $value['material_code_show']);
+            $key = $value['order_item_id'] . hash('md5', $value['material_code_show']);
             $this->dellimitingSendRequestBackg($key);
         }
     }