Zhouzhendong 4 лет назад
Родитель
Сommit
69d3e427de
3 измененных файлов с 13 добавлено и 44 удалено
  1. 0 4
      app/Exceptions/Exception.php
  2. 0 8
      app/Exceptions/Handler.php
  3. 13 32
      app/Http/Controllers/TestController.php

+ 0 - 4
app/Exceptions/Exception.php

@@ -19,10 +19,6 @@ class Exception extends \Exception
     }
     public function logging()
     {
-        \Illuminate\Support\Facades\Log::info("抓取内存耗尽错误",debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT,5));
-        if (substr($this->getFile(),-(strlen("FatalError.php")))==='FatalError.php'){
-            \Illuminate\Support\Facades\Log::emergency("FPM内存耗尽",["user"=>Auth::id(),"param"=>request()]);
-        }
         $exception=$this;
         list(
             $className,

+ 0 - 8
app/Exceptions/Handler.php

@@ -47,16 +47,8 @@ class Handler extends ExceptionHandler
 
     public function render( $request, Throwable $exception)
     {
-        \Illuminate\Support\Facades\Log::info("抓取内存耗尽错误",debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT,5));
         $errMsg='';
         try{
-            if (substr($exception->getFile(),-(strlen("FatalError.php")))==='FatalError.php'){
-                \Illuminate\Support\Facades\Log::emergency("FPM内存耗尽",["user"=>Auth::id(),"param"=>$request->all()]);
-                return response()->view('exception.default',[
-                    'code'=> "500",
-                    'message'=>"网站负载过大,联系管理员处理",
-                ]);
-            }
             $type = $exception->type ?? 'error';
             $errMsg=(function()use($request,$exception){
                 return $errMsg=

+ 13 - 32
app/Http/Controllers/TestController.php

@@ -194,40 +194,21 @@ class TestController extends Controller
         }
         app("BatchService")->assignTasks($batches);
     }
-    /**
-     * 检查和处理揽收
-     *
-     * @param OrderPackage|\stdClass $package
-     */
-    public function checkingAndProcess(OrderPackage $package, int $lineNo)
-    {
-        //校验快递商 订单状态 复核标记 揽收标记
-        $package->loadMissing("order.logistic");
-        if ($package->collecting_status == '1' || !$package->logistic_number)dd(1);
-        if (strpos($package->order->logistic->code ?? '','ZTO') === false)dd(2);
-        $statusMapping = array_flip(Order::STATUS);
-        //if (($statusMapping[$package->order->wms_status] ?? 99) > 63)dd(3);
-        /** @var OrderPackageService $orderPackageService */
-        $orderPackageService = app('OrderPackageService');
-        $result = $orderPackageService->collectUpload([$package->logistic_number]);
-        dump($result);
-        if (!$result["success"]){
-            dd("自动揽收失败",["message"=>$result["message"],"param"=>$package->logistic_number]);
-        }
-        $result = app("OrderService")->allocation($package->order->code,$lineNo);
-        dump($result);
-        if (mb_substr($result,0,3)=='000'){
-            if (OrderPackage::query()->where("id",$package->id)
-                    ->where("collecting_status",'0')->update(["collecting_status"=>'1'])!=1)
-                dd("自动揽收异常",["message"=>"未能成功修改揽收标记","param"=>$package->toArray()]);
-        }else  dd("自动揽收失败",["message"=>"分配失败:{$result}","param"=>$package->order->code." : {$lineNo}"]);
-    }
     public function test()
     {
-        $ForeignHaiRoboticsService = new ForeignHaiRoboticsService();
-        $stationService = new StationService();
-        $station = Station::query()->find(14);
-        $station->materialBox = MaterialBox::query()->where("code","IDE0002482")->first();
+        $o = Order::query()->select("code","id")->with("bin")->where("batch_id","186958")->get();
+        dd($o->toArray());
+
+       $stores = Store::query()->whereIn("id",[490692,492252,492405,493259,491290,491758,492252,492989,493522,
+           496079,490702,491173,491780,493522,488622,490891,491020,491173,493308,489448,491020,491184,493573,493977,
+           496105,492086,493714,493977,496118,492593,492592,492591,492590,493011,493979,490721,492192,493429,493978,
+           496106,490721,491460,493165,496114,489319,489436,490703,491190,493957,496115,496114,489436,491147,
+           491695,492395,490711,491461,491695,492079,494533,496099,496096,490711,491458,491797,492244,
+           492422,496098,496097,496100,491458,491798,493572,493752,490443,491457,492394,493531,493572,491687,
+           492394,492968,493782,490431,490994,493782,488570,489103,490616,490994,493966,489862,490616,
+           490629,495645,490629,491455,488793])->get();
+       $this->dispatch(new StoreCreateInstantBill($stores));
+       dd(1);
 
         /** @var StationTaskMaterialBox $stationTaskMaterialBox */
         $stationTaskMaterialBox = app("StorageService")->createWarehousingTask($stationService->getStation_byType('立库')["id"],$station->materialBox->id);