LD 5 жил өмнө
parent
commit
c1eec86084

+ 0 - 54
app/Http/Controllers/PackageController.php

@@ -44,7 +44,6 @@ class PackageController extends Controller
      */
     public function store(Request $request)
     {
-        $start_at = microtime(true);
         if(!Gate::allows('称重管理-录入')){ return redirect(url('/'));  }
         $this->validator($request)->validate();
         $logistic_number=$request->input('logistic_number');
@@ -57,10 +56,6 @@ class PackageController extends Controller
         $package=null;
         $successTip = '操作成功';
 
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 1:$time1");
-        $start_at = microtime(true);
-
         /** @var OrderPackage $package */
         if ($order_code){
             $package=OrderPackage::query()->with(['order'=>function($query)use($order_code){
@@ -77,37 +72,19 @@ class PackageController extends Controller
         $accomplishToWMS=new Api\thirdPart\flux\PackageController();
 
 
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 2:$time1");
-        $start_at = microtime(true);
-
         if($batch_number){
             app('LogService')->log(__METHOD__,'活动波次开始同步_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
 //            $this->syncBatch($package->batch_number,$weight,null,null,null,Carbon::now(),null);
             $result=$accomplishToWMS->markWMSOnBatch($batch_number,$weight);
 
 
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 3:$time1");
-            $start_at = microtime(true);
 
             OrderPackage::createPackagesFromBatchCode($batch_number,$weight);
 
 
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 4:$time1");
-            $start_at = microtime(true);
-
             if($package&&$package->isActivityBatch())
                 $package->unifyThisMeasureUnderSameBatch();
 
-
-
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 5.1:$time1");
-            $start_at = microtime(true);
-
-
             if ($result['result']){
                 Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'批量更改波次上传成功'.$batch_number);
                 $successTip = "批量录入波次成功!波次号:$batch_number";
@@ -115,22 +92,10 @@ class PackageController extends Controller
             }
             Controller::logS(__METHOD__,'error_'.__FUNCTION__,'批量更改波次上传异常:'.$result['message'].$batch_number);
 
-
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 5.2:$time1");
-            $start_at = microtime(true);
-
             return redirect('package/create')->with('successError','录入失败!'.$result['message']);
         }
         if (!$package && !$logistic_number)return redirect('package/create')->with('successError','录入失败!系统内没有对应波次的包裹!');
         if ($package){
-
-
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 7:$time1");
-            $start_at = microtime(true);
-
-
             if(!$package->batch_number)$package->batch_number=$batch_number;
             //if(!$package->order_code)$package->order_code=$order_code;
             $package->fetchAllFromOracle();
@@ -146,19 +111,8 @@ class PackageController extends Controller
             app('LogService')->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
 //            event(new WeighedEvent($package));
 
-
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 7.1:$time1");
-            $start_at = microtime(true);
-
-
         }else{
 
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 7.3:$time1");
-            $start_at = microtime(true);
-
-
             /** @var OrderPackageService */
             $package = app('OrderPackageService')->firstOrCreate($logistic_number,[
                 'weight'=>$weight,
@@ -180,17 +134,9 @@ class PackageController extends Controller
             $package->save();
             $successTip = $str;
 
-            $time1 = floor((microtime(true)-$start_at));
-            app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 7.4:$time1");
-            $start_at = microtime(true);
-
 
         }
 
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batch_number} 8:$time1");
-        $start_at = microtime(true);
-
 
         return redirect('package/create')->with('successTip', $successTip);
     }

+ 0 - 15
app/OrderPackage.php

@@ -96,7 +96,6 @@ class OrderPackage extends Model
         $this['batch_number'] = $this->oracleInfo['waveno']??null;
     }
     static public function createPackagesFromBatchCode($batchCode,$weight){
-        $start_at = microtime(true);
 
 
 
@@ -109,11 +108,6 @@ class OrderPackage extends Model
         $packages = [];
         $now = Carbon::now();
 
-
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batchCode} 3.1:$time1");
-        $start_at = microtime(true);
-
         foreach($resultOracleObjs_grouped as $resultOracleObj_grouped){
             $resultOracleObj = $resultOracleObj_grouped[0];
             /** @var OrderService $orderService*/
@@ -135,11 +129,6 @@ class OrderPackage extends Model
         }
 
 
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batchCode} 3.2:$time1");
-        $start_at = microtime(true);
-
-
         $packagesLogisticNumbers = array_map(function ($orderPackage) {
             return $orderPackage['logistic_number'];
         } ,$packages);
@@ -162,10 +151,6 @@ class OrderPackage extends Model
         });
 
 
-        $time1 = floor((microtime(true)-$start_at));
-        app('LogService')->log(__METHOD__,'timemark_'.__FUNCTION__,"{$batchCode} 3.3:$time1");
-        $start_at = microtime(true);
-
         app('LogService')->log(__METHOD__,"批量录入包裹成功",json_encode($packages),Auth::user()['id']);
     }
     public function unifyThisMeasureUnderSameBatch(){