Merge branch 'master' into zengjun

# Conflicts:
#	app/Http/Controllers/OrderIssueController.php
#	app/Services/LogisticService.php
#	app/Services/OrderTrackingService.php

app/Batch.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Batch extends Model
+{
+    protected $fillable = [
+        'id','code','type', 'wms_type', 'status', 'wms_status', 'wms_created_at',
+    ];
+    public function orders(){
+        return $this->hasMany('App\Order','batch_id','id');
+    }
+    public function setProcessed(){
+        $this['status'] = '已处理';
+        $this->orders()->each(function (Order $order){
+            $order->setProcessed();
+        });
+        $this->update();
+    }
+    public function assignBins(){
+        $this->orders()->each(function (Order $order,$i){
+            $bin=new OrderBin(['order_id'=>$order['id'],'number'=>($i+1)]);
+            $bin->save();
+        });
+        return $this->orders()->count();
+    }
+    public function delete()
+    {
+        $this->orders()->each(function(Order $order){
+            $order->delete();
+        });
+        return parent::delete(); // TODO: Change the autogenerated stub
+    }
+
+}

app/Console/Commands/CreateOwnerReport.php

@@ -112,8 +112,7 @@ class CreateOwnerReport extends Command
             ];
         }
         //执行生成或修改
-        LogService::log(__METHOD__,"生成货主报表",json_encode($createReports));
-        LogService::log(__METHOD__,"修改货主报表",json_encode($updateReports));
+        app('LogService')->log(__METHOD__,"生成货主报表",json_encode($createReports));
         app(BatchUpdateService::class)->batchUpdate('owner_reports', $updateReports);
         DB::table("owner_reports")->insert($createReports);
     }

app/Console/Commands/InventoryDailyLoggingOwner.php

@@ -115,7 +115,7 @@ class InventoryDailyLoggingOwner extends Command
                 'volumn'=>$commodity['volumn'],
             ];
             $result = $commodityService->updateOrCreate($param,$column);
-            LogService::log(__METHOD__,"同步库存每日记录时修改或生成商品",json_encode($column));
+            app('LogService')->log(__METHOD__,"同步库存每日记录时修改或生成商品",json_encode($column));
 
             $commodity_id = $result->id;
             //寻找对应barcode是否存在，不存在录入
@@ -143,7 +143,7 @@ class InventoryDailyLoggingOwner extends Command
             ];
         }
         DB::table('inventory_daily_logs')->insert($data);
-        LogService::log(__METHOD__,"同步库存每日记录",json_encode($data));
+        app('LogService')->log(__METHOD__,"同步库存每日记录",json_encode($data));
     }
 
     public function getLoggingOwners(){

app/Console/Commands/WasSyncWmsAsnInformation.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\LogService;
+use App\Services\OrderTrackingService;
+use App\Services\StoreService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Auth;
+
+class WasSyncWmsAsnInformation extends Command
+{
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'WasSyncWmsAsnInformation';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '同步WMS的入库信息';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $this->WasSyncWmsAsn();
+    }
+
+    public function WasSyncWmsAsn(){
+
+        /** @var StoreService $storeService */
+        $storeService  = app('storeService');
+
+        $dataInterval = intval(data_get(config('sync'), 'asn_sync.interval')) * 60 + 5;
+
+        $startDate = Carbon::now()->subSeconds($dataInterval);
+
+        $syncStartDate = data_get(config('sync'), 'asn_sync.start_at');
+
+        if($syncStartDate ?? false){
+            $syncStartDate = Carbon::parse($syncStartDate);
+            if ($startDate->lt($syncStartDate)) {
+                $startDate = $syncStartDate;
+            }
+        }
+        //$storeService->syncWmsAsnData($startDate);
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -85,7 +85,7 @@ class LoginController extends Controller
 
         if ($this->attemptLogin($request)) {
             if(env('DB_USERNAME')!='developer')
-                $this->log(__METHOD__,__FUNCTION__,'',Auth::user()['id']);
+                app('LogService')->log(__METHOD__,__FUNCTION__,'',Auth::user()['id']);
             if($request['is_json']){
                 return ['success'=>true,'url'=>url($this->redirectTo)];
             }
@@ -94,7 +94,7 @@ class LoginController extends Controller
 
         $this->incrementLoginAttempts($request);
         if(env('DB_USERNAME')!='developer')
-            $this->log(__METHOD__,__FUNCTION__,'',Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'',Auth::user()['id']);
         if($request['is_json']){
             return ['success'=>false,'errors'=>['name'=>['登录信息验证失败']]];
         }

app/Http/Controllers/Auth/RegisterController.php

@@ -96,7 +96,7 @@ class RegisterController extends Controller
         if ($userWorkgroupId){
             $user->userWorkgroups()->sync([$userWorkgroupId]);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user['id']);
         if($headTo){return redirect(url($headTo))->with('successTip',"录入用户 {$user->name} 成功");}
         return $this->registered($request, $user)
             ?: redirect($this->redirectPath());

app/Http/Controllers/AuthorityController.php

@@ -68,7 +68,7 @@ class AuthorityController extends Controller
 //        $authority=new Authority($inputs);
 //        $authority->save();
 //
-//        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+//        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
 //        return redirect('maintenance/authority/create')->with('successTip',"成功录入权限“{$successName}”");
 //    }
 
@@ -81,7 +81,7 @@ class AuthorityController extends Controller
         $authority=new Authority(['alias_name'=>"(货主：{$owner['name']})",'name'=>"_{$owner['id']}",'remark'=>"(key: _{$owner['id']})"]);
         $authority->save();
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/authority/create')->with('successTip',"成功录入权限: (货主：{$owner['name']})");
     }
 
@@ -141,7 +141,7 @@ class AuthorityController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $authority->fill($request->all());
         $authority->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/authority/')->with('successTip',"成功修改权限“{$authority['name']}”！");
     }
 
@@ -155,7 +155,7 @@ class AuthorityController extends Controller
     public function destroy(Authority $authority)
     {
         if(!Gate::allows('权限-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$authority->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$authority->toJson(),Auth::user()['id']);
         $re=$authority->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/BatchController.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Batch;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+
+class BatchController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Http\Response|\Illuminate\View\View
+     */
+    public function index()
+    {
+        if(!Gate::allows('波次-查询')){ return redirect(url('/'));  }
+        $batches=Batch::orderBy('id','desc')->paginate(50);
+        return view('maintenance.batch.index',compact('batches'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Batch  $batch
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Batch $batch)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Batch  $batch
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Batch $batch)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Batch  $batch
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Batch $batch)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Batch  $batch
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Batch $batch)
+    {
+        //
+    }
+}

app/Http/Controllers/CarTypesController.php

@@ -32,7 +32,7 @@ class CarTypesController extends Controller
         $this->validatorCarType($request,$id)->validate();
         $carTypes=$request->input('CarType');
         if(CarType::create($carTypes)){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/carType')->with('successTip','新车辆“'.$request->input('CarType.name').'”添加成功');
         };
     }
@@ -52,7 +52,7 @@ class CarTypesController extends Controller
         $carType=CarType::find($id);
         $carType->fill($data);
         if ($carType->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/carType')->with('successTip','车型“'.$request->input('CarType.name').'”修改成功');
         }
     }
@@ -61,7 +61,7 @@ class CarTypesController extends Controller
     {
         if(!Gate::allows('车型-删除')){ return redirect(url('/'));  }
         $carType=CarType::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($carType),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($carType),Auth::user()['id']);
         $result=$carType->delete();
         return ['success'=>$result];
     }

app/Http/Controllers/CarriersController.php

@@ -32,7 +32,7 @@ class CarriersController extends Controller
         $this->validatorCarrier($request,$id)->validate();
         $carriers=$request->input('Carrier');
         if(Carrier::query()->create($carriers)){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/carrier')->with('successTip','新承运商“'.$request->input('Carrier.name').'”添加成功');
         };
     }
@@ -52,7 +52,7 @@ class CarriersController extends Controller
         $carrier=Carrier::query()->find($id);
         $carrier->fill($data);
         if ($carrier->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/carrier')->with('successTip','承运商“'.$request->input('Carrier.name').'”修改成功');
         }
     }
@@ -61,7 +61,7 @@ class CarriersController extends Controller
     {
         if(!Gate::allows('承运商-删除')){ return redirect(url('/'));  }
         $carrier=Carrier::query()->find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($carrier),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($carrier),Auth::user()['id']);
         $result=$carrier->delete();
         return ['success'=>$result];
     }

app/Http/Controllers/CitiesController.php

@@ -33,7 +33,7 @@ class CitiesController extends Controller
         $this->validatorCities($request,$id)->validate();
         $cities=$request->input('City');
         if(City::create($cities)){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/city')->with('successTip','新城市“'.$request->input('City.name').'”添加成功');
         };
     }
@@ -54,7 +54,7 @@ class CitiesController extends Controller
         $city=City::find($id);
         $city->fill($data);
         if ($city->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/city')->with('successTip','城市“'.$request->input('City.name').'”修改成功');
         }
     }
@@ -63,7 +63,7 @@ class CitiesController extends Controller
     {
         if(!Gate::allows('城市-删除')){ return redirect(url('/'));  }
         $city=City::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($city),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($city),Auth::user()['id']);
         $result=$city->delete();
         return ['success'=>$result];
     }

app/Http/Controllers/CommodityController.php

@@ -56,7 +56,7 @@ class CommodityController extends Controller
         $commodity->save();
         $commodity->newBarcode($request->input('barcode'));
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/commodity/create')->with('successTip',"成功录入商品信息：“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -109,7 +109,7 @@ class CommodityController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $commodity->fill($request->all());
         $commodity->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/commodity/')->with('successTip',"成功修改商品信息：“{$commodity['name']}”！");
     }
 
@@ -123,7 +123,7 @@ class CommodityController extends Controller
     public function destroy(Commodity $commodity)
     {
         if(!Gate::allows('商品信息-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$commodity->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$commodity->toJson(),Auth::user()['id']);
         $re=$commodity->delete();
         return ['success'=>$re];
     }
@@ -258,7 +258,7 @@ class CommodityController extends Controller
 
         if (count($updateCommodities) > 1){
             $commodityService->batchUpdate($updateCommodities);
-            LogService::log(__METHOD__,"同步商品-批量更新",json_encode($updateCommodities));
+            app('LogService')->log(__METHOD__,"同步商品-批量更新",json_encode($updateCommodities));
             $commodityBarcodes = $commodityBarcodeService->get(['commodity_id'=>$commoditiesId, 'code'=>$barcodes]);
 
             unset($commoditiesId,$barcodes);
@@ -277,7 +277,7 @@ class CommodityController extends Controller
                     ];
                 }
                 $commodityBarcodeService->insert($barcodeInsert);
-                LogService::log(__METHOD__,"同步商品-录入条码",json_encode($barcodeInsert));
+                app('LogService')->log(__METHOD__,"同步商品-录入条码",json_encode($barcodeInsert));
             }
         }
 
@@ -345,13 +345,13 @@ class CommodityController extends Controller
             }
             if (count($updateCommodities) > 0){
                 $commodityService->batchUpdate($updateCommodities);
-                LogService::log(__METHOD__,"同步商品-批量更新",json_encode($updateCommodities));
+                app('LogService')->log(__METHOD__,"同步商品-批量更新",json_encode($updateCommodities));
             }
         }
 
         if (count($createCommodities) > 0){
             $commodityService->insert($createCommodities);
-            LogService::log(__METHOD__,"同步商品-录入商品",json_encode($createCommodities));
+            app('LogService')->log(__METHOD__,"同步商品-录入商品",json_encode($createCommodities));
             $commodities = $commodityService->get(['owner_id'=>$owner_id , 'sku'=>$skus]);
             $barcodeInsert = [];
             foreach ($commodities as $commodity){
@@ -364,7 +364,7 @@ class CommodityController extends Controller
                 }
             }
             $commodityBarcodeService->insert($barcodeInsert);
-            LogService::log(__METHOD__,"同步商品-录入条码",json_encode($barcodeInsert));
+            app('LogService')->log(__METHOD__,"同步商品-录入条码",json_encode($barcodeInsert));
         }
     }
 }

app/Http/Controllers/Controller.php

@@ -18,13 +18,13 @@ class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
     static public function logS($method,$type,$description,$id_user=null){
-        LogService::log($method,$type,$description,$id_user=null);
+        app('LogService')->log($method,$type,$description,$id_user=null);
     }
     public function log($method,$type,$description,$id_user=null){
-        LogService::log($method,$type,$description,$id_user);
+        app('LogService')->log($method,$type,$description,$id_user);
     }
     public function apiError($method,$description){
-        $this->log($method,'apiError',$description);
+        app('LogService')->log($method,'apiError',$description);
         return ['success'=>'false','fail_info'=>$description];
     }
 }

app/Http/Controllers/InventoryAccountController.php

@@ -45,6 +45,20 @@ class InventoryAccountController extends Controller
         $inventoryAccount=InventoryAccount::where('id',$id)->delete();
         return ['success'=>true,'data'=>$inventoryAccount];
     }
+    public function inventoryChecked(Request $request){
+        if(!Gate::allows('库存管理-盘点-项目审核')){return['success'=>false,'msg'=>'没有权限'];}
+        $id=$request->id;
+        if(is_null($id)){return ['success'=>false,'msg'=>'传入id为空'];}
+        $inventoryAccount=InventoryAccount::query()->where('id',$id)->update([
+            'auditor'=>Auth::user()['id'],
+        ]);
+        if ($inventoryAccount==1) {
+            $inventoryAccount=InventoryAccount::query()->with('userAuditor')->find($id);
+            return ['success'=>true,'data'=>$inventoryAccount];
+        }else{
+            return ['success'=>false,'msg'=>'审核失败!'];
+        }
+    }
 
     //盘点-任务页面
     public function mission(Request $request,OwnerService $ownerService){
@@ -176,7 +190,7 @@ class InventoryAccountController extends Controller
         $id=$request->input('id');
         if (!$id) return ['success'=>false,'data'=>'参数错误!'];
         $inventoryAccount=InventoryAccount::query()->where('id',$id)->update(['status'=>'复盘中']);
-        $this->log(__METHOD__,'结束初盘任务'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'结束初盘任务'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         if ($inventoryAccount>0) return ['success'=>true,'data'=>'复盘中'];
         return ['success'=>false,'data'=>'参数错误!'];
     }
@@ -194,7 +208,7 @@ class InventoryAccountController extends Controller
         $quality=$request->quality;
         $ownerCode=$request->ownerCode;
         $inventoryAccountMission=app('inventoryAccountService')->修改质量状态($id,$location,$sku,$quality,$ownerCode);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         if ($inventoryAccountMission==null) return ['success'=>false,'data'=>'WMS中不存在该条记录！'];
         return ['success'=>true,'data'=>'质量状态修改成功'];
 

app/Http/Controllers/InventoryCompareController.php

@@ -117,7 +117,7 @@ class InventoryCompareController extends Controller
                     for ($i = 0; $i < count($exception); $i++) {
                         $a .= implode(',', $exception[$i]) . '&#10';
                     };
-                    $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+                    app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
                     return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
 //                }else {
 //                    return '<h1 class="text-danger">导入Excel成功</h1>';

app/Http/Controllers/LaborCompanyController.php

@@ -46,7 +46,7 @@ class LaborCompanyController extends Controller
         $laborCompany=new LaborCompany($request->all());
         $laborCompany->save();
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/laborCompany/create')->with('successTip',"成功录入劳务所“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -97,7 +97,7 @@ class LaborCompanyController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $laborCompany->fill($request->all());
         $laborCompany->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/laborCompany/')->with('successTip',"成功修改劳务所“{$laborCompany['name']}”！");
     }
 
@@ -111,7 +111,7 @@ class LaborCompanyController extends Controller
     public function destroy(LaborCompany $laborCompany)
     {
         if(!Gate::allows('物流公司-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$laborCompany->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$laborCompany->toJson(),Auth::user()['id']);
         $re=$laborCompany->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/LaborReportController.php

@@ -53,13 +53,13 @@ class LaborReportController extends Controller
                 $tenMinutesLater=Carbon::parse($laborReport->created_at)->subHours(-2)->format('Y-m-d H:i:s');
                 if (Carbon::now()->format('Y-m-d H:i:s')>$tenMinutesLater){
                     $laborReport->delete();
-                    $this->log(__METHOD__,"组长未审核该条记录将在10分钟后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+                    app('LogService')->log(__METHOD__,"组长未审核该条记录将在10分钟后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
                 }
             }
             $addOneHourCheckedAt=Carbon::parse($laborReport->userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H:i:s');
             if (!$laborReport->userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')>$addOneHourCheckedAt){
                 $laborReport->delete();
-                $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }
         }
         $laborCompanies=LaborCompany::query()->get();
@@ -119,12 +119,12 @@ class LaborReportController extends Controller
             'status'=>'已入场',
         ]);
         $laborReportStatus->save();
-        $this->log(__METHOD__,"门卫打卡审核创建当前临时工报表状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"门卫打卡审核创建当前临时工报表状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
         $userDutyCheck=UserDutyCheck::find($userDutyCheckId);
         $userDutyCheck->verify_user_id=Auth::user()['id'];
         $userDutyCheck->update();
         event(new GuardAuditEvent($userDutyCheck));
-        $this->log(__METHOD__,"门卫打卡审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"门卫打卡审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         return ["success"=>true,"data"=>$userDutyCheck->verify_user_id];
     }
     //打卡组长审核
@@ -136,7 +136,7 @@ class LaborReportController extends Controller
         $laborReport->verify_at=date('Y-m-d H:i:s');
         $laborReport->update();
         $laborReport->verifyPerson=Auth::user()['name'];
-        $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
         event(new TeamAuditEvent($laborReport));
         return ["success"=>true,"data"=>$laborReport];
     }
@@ -152,7 +152,7 @@ class LaborReportController extends Controller
         $laborReport->update();
         $laborReport->setRemarkAttribute($remark,$id);
         $laborReport->verifyPerson=Auth::user()['name'];
-        $this->log(__METHOD__,"打卡组长审核并添加相应备注".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"打卡组长审核并添加相应备注".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
         event(new TeamAuditEvent($laborReport));
         return ["success"=>true,"data"=>$laborReport];
     }
@@ -167,7 +167,7 @@ class LaborReportController extends Controller
             'status'=>'已退组',
         ]);
         $laborReportStatus->save();
-        $this->log(__METHOD__,"报表记录退组对应状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"报表记录退组对应状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
         $check_out_at=Carbon::now()->format('Y-m-d H:i:s');
         $check_in_at=$laborReport->check_in_at;
         $laborReport->check_out_at=$check_out_at;
@@ -182,7 +182,7 @@ class LaborReportController extends Controller
         }
         $laborReport->update();
         $laborReport->is_exportGroup=$laborReport->getIsExportGroupAttribute();
-        $this->log(__METHOD__,"退组".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"退组".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
         event(new ClockoutEvent($laborReport));
         return ["success"=>true,"data"=>$laborReport];
     }
@@ -199,7 +199,7 @@ class LaborReportController extends Controller
             'status'=>'已退组',
         ]);
         $laborReportStatus->save();
-        $this->log(__METHOD__,"报表记录退组对应状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"报表记录退组对应状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
         $check_out_at=Carbon::now()->format('Y-m-d H:i:s');
         $check_in_at=$laborReport->check_in_at;
         $laborReport->check_out_at=$check_out_at;
@@ -219,7 +219,7 @@ class LaborReportController extends Controller
         }
         $laborReport->update();
         $laborReport->is_exportGroup=$laborReport->getIsExportGroupAttribute();
-        $this->log(__METHOD__,"退组".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"退组".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
         event(new ClockoutEvent($laborReport));
         return ["success"=>true,"data"=>$laborReport];
     }
@@ -267,7 +267,7 @@ class LaborReportController extends Controller
     function recover(Request $request){
         if(!Gate::allows('人事管理-临时工报表-删除')){ return redirect('/');  }
         $checkData=$request->checkData;
-        $this->log(__METHOD__,"回收站恢复临时工报表记录_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"回收站恢复临时工报表记录_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>LaborReport::withTrashed()->whereIn('id',$checkData)->restore()];
     }
     public function changeLaborReportRemark(Request $request){
@@ -279,7 +279,7 @@ class LaborReportController extends Controller
         }
         $laborReport=LaborReport::find($laborReportId);
         $laborReport->setRemarkAttribute($laborReportRemark,$laborReportId);
-        $this->log(__METHOD__,'添加或者修改临时工报表备注'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'添加或者修改临时工报表备注'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>true,'status'=>$laborReport];
     }
 }

app/Http/Controllers/LogController.php

@@ -92,7 +92,7 @@ class LogController extends Controller
     public function destroy(Log $log)
     {
 //        if(!Gate::allows('物流公司-删除')){ return redirect(url('/'));  }
-//        $this->log(__METHOD__,__FUNCTION__,$log->toJson(),Auth::user()['id']);
+//        app('LogService')->log(__METHOD__,__FUNCTION__,$log->toJson(),Auth::user()['id']);
 //        $re=$log->delete();
 //        return ['success'=>$re];
     }

app/Http/Controllers/LogisticController.php

@@ -48,7 +48,7 @@ class LogisticController extends Controller
         $logistic=new Logistic($request->all());
         $logistic->save();
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/logistic/create')->with('successTip',"成功录入物流公司“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -101,7 +101,7 @@ class LogisticController extends Controller
         $this->validatorUpdate($request->all(),$logistic->id)->validate();
         $logistic->fill($request->all());
         $logistic->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/logistic/')->with('successTip',"成功修改物流公司“{$logistic['name']}”！");
     }
 
@@ -115,7 +115,7 @@ class LogisticController extends Controller
     public function destroy(Logistic $logistic)
     {
         if(!Gate::allows('物流公司-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$logistic->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$logistic->toJson(),Auth::user()['id']);
         $re=$logistic->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/LogisticNumberFeatureController.php

@@ -103,7 +103,7 @@ class LogisticNumberFeatureController extends Controller
         if($numberLength<$featureConsideringLength)
             $featureConsideringLength=$numberLength;
         if(!$logisticNumber){
-            $this->log(__METHOD__, 'error', '创建退货快递单号特征时，单号传入了空值');
+            app('LogService')->log(__METHOD__, 'error', '创建退货快递单号特征时，单号传入了空值');
             return null;
         };
         $featuresCreated=[];
@@ -120,7 +120,7 @@ class LogisticNumberFeatureController extends Controller
     private function createFeature(int $logisticId,string $featureName, string $value,int $weight)
     {
         if(!$value){
-            $this->log(__METHOD__, 'error', "创建退货快递单号特征{$featureName}时，特征值为空");
+            app('LogService')->log(__METHOD__, 'error', "创建退货快递单号特征{$featureName}时，特征值为空");
             return null;
         };
         $feature=LogisticNumberFeature::where('logistic_id',$logisticId)

app/Http/Controllers/MeasuringMachineController.php

@@ -95,7 +95,7 @@ class MeasuringMachineController extends Controller
     {
         if(!Gate::allows('测量设备-删除')){ return redirect(url('/'));  }
         $measuringMachine=MeasuringMachine::find($id)->delete();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($measuringMachine),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($measuringMachine),Auth::user()['id']);
         if ($measuringMachine)return ['success'=>true];
     }
 

app/Http/Controllers/OrderBinController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\OrderBin;
+use Illuminate\Http\Request;
+
+class OrderBinController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\OrderBin  $orderBin
+     * @return \Illuminate\Http\Response
+     */
+    public function show(OrderBin $orderBin)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\OrderBin  $orderBin
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(OrderBin $orderBin)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\OrderBin  $orderBin
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, OrderBin $orderBin)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\OrderBin  $orderBin
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(OrderBin $orderBin)
+    {
+        //
+    }
+}

app/Http/Controllers/OrderCommodityController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\OrderCommodity;
+use Illuminate\Http\Request;
+
+class OrderCommodityController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\OrderCommodity  $orderCommodity
+     * @return \Illuminate\Http\Response
+     */
+    public function show(OrderCommodity $orderCommodity)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\OrderCommodity  $orderCommodity
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(OrderCommodity $orderCommodity)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\OrderCommodity  $orderCommodity
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, OrderCommodity $orderCommodity)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\OrderCommodity  $orderCommodity
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(OrderCommodity $orderCommodity)
+    {
+        //
+    }
+}

app/Http/Controllers/OrderController.php

@@ -154,7 +154,7 @@ class OrderController extends Controller
         $data=[];
         foreach ($ordersNotNull as $order){
             OracleDOCOrderHeader::query()->where('orderno',$order->orderno)->update(["notes"=>($order->notes).",".$content]);
-            $this->log(__METHOD__,'批量备注追加修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'批量备注追加修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             $order->notes=($order->notes).",".$content;
             array_push($data,$order);
         }
@@ -175,10 +175,10 @@ class OrderController extends Controller
             $waveno=OracleDOCOrderHeader::where('orderno',$order->orderno)->value('waveno');
             if ($waveno && $waveno!='*'){
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
-                $this->log(__METHOD__,'批量冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,'批量冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
             $is_freeze=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['releasestatus'=>'H','waveno'=>'*']);
-            $this->log(__METHOD__,'批量冻结修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'批量冻结修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             if (!$is_freeze)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];
@@ -196,10 +196,10 @@ class OrderController extends Controller
             $waveno=OracleDOCOrderHeader::where('orderno',$order->orderno)->value('waveno');
             if ($waveno && $waveno!='*'){
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
-                $this->log(__METHOD__,'批量取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,'批量取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
             $deAllocation=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['sostatus'=>'00','waveno'=>'*']);
-            $this->log(__METHOD__,'批量取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'批量取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             if (!$is_deAllocation||!$deAllocation)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];
@@ -211,10 +211,10 @@ class OrderController extends Controller
         $waveno=$request->input('waveno');
         if ($waveno && $waveno!='*'){
             OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$orderno)->delete();
-            $this->log(__METHOD__,'冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }
         OracleDOCOrderHeader::where('orderno',$orderno)->update(['releasestatus'=>'H','waveno'=>'*']);
-        $this->log(__METHOD__,'冻结'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'冻结'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>true];
     }
     public function thaw(Request $request){
@@ -224,7 +224,7 @@ class OrderController extends Controller
             $orderno = [$orderno];
         }
         OracleDOCOrderHeader::query()->whereIn('orderno',$orderno)->update(['releasestatus'=>'N']);
-        $this->log(__METHOD__,'解冻'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'解冻'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>true];
     }
 
@@ -233,7 +233,7 @@ class OrderController extends Controller
         if(!Gate::allows('订单管理-编辑')){ return redirect(url('/'));  }
         $orderno=$request->orderno;
         OracleDOCOrderHeader::query()->whereIn('orderno',$orderno)->where('edisendflag2','W')->update(['edisendflag2'=>'N']);
-        $this->log(__METHOD__,'解冻'.__FUNCTION__,json_encode($orderno),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'解冻'.__FUNCTION__,json_encode($orderno),Auth::user()['id']);
         return ['success'=>true];
     }
 
@@ -244,10 +244,10 @@ class OrderController extends Controller
         $waveno=$request->input('waveno');
         if ($waveno && $waveno!='*'){
             OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$orderno)->delete();
-            $this->log(__METHOD__,'取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }
         OracleDOCOrderHeader::where('orderno',$orderno)->update(['sostatus'=>'00','waveno'=>'*']);
-        $this->log(__METHOD__,'取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         $is_deAllocation=$this->isDeAllocation($orderno);
         if($is_deAllocation) return ['success'=>true];
 
@@ -284,7 +284,7 @@ class OrderController extends Controller
         oci_bind_by_name($stmt,':OUT_Return_Code',$OUT_Return_Code,300);
         oci_execute($stmt);
         if (substr($OUT_Return_Code,0,3) != '000'){
-            $this->log(__METHOD__,'调用sp根据订单取消分配失败'.__FUNCTION__,"ORDERNO:".$orderno."ERROR：".$OUT_Return_Code);
+            app('LogService')->log(__METHOD__,'调用sp根据订单取消分配失败'.__FUNCTION__,"ORDERNO:".$orderno."ERROR：".$OUT_Return_Code);
             return false;
         }
         oci_close($conn);

app/Http/Controllers/OrderIssueController.php

@@ -118,7 +118,7 @@ class OrderIssueController extends Controller
                 for ($i = 0; $i < count($exception); $i++) {
                     $a .= implode(',', $exception[$i]) . '&#10';
                 };
-                $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+                app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
                 return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
             }
         } else {
@@ -185,7 +185,7 @@ class OrderIssueController extends Controller
         $orderIssue = OrderIssue::query()->where('id', $request->input('id'))->first();
         $bool = $orderIssue->delete();
         if ($bool) {
-            $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
             return ['success' => 'true'];
         } else {
             return ['success' => 'false', 'fail_info' => '删除问题单出现异常,请联系管理员'];
@@ -205,10 +205,10 @@ class OrderIssueController extends Controller
             $orderIssue = OrderIssue::query()->find($request->id);
             $orderIssue->update($data);
             $orderIssue->同步退单状态();
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request));
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request));
             return  ['success' => true];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent())."||".$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request)."||".$e->getMessage().'||'.$e->getTraceAsString());
             return  ['success' => false ,'fail_info' => $e->getMessage()];
         }
     }
@@ -229,7 +229,7 @@ class OrderIssueController extends Controller
             foreach ($request->input('ids') as $id) {
                 OrderIssueProcessLog::query()->create(['order_issue_id' => $id, 'user_id' => Auth::user()['id'], 'type' => '结束', 'content' => '完结订单']);
             }
-            $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
             return ['success' => true];
         }
     }
@@ -246,10 +246,10 @@ class OrderIssueController extends Controller
             OrderIssue::query()
                 ->where('id', $request->input('id'))
                 ->update(['is_new_rejecting' => '已处理']);
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
             return ['success'=>true];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent())."||".$e->getMessage()."||".$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent())."||".$e->getMessage()."||".$e->getTraceAsString());
             return ['success' => false,'fail_info' => $e->getMessage()];
         }
     }
@@ -347,10 +347,10 @@ class OrderIssueController extends Controller
             OrderIssue::query()
                 ->where('id', $request->input('id'))
                 ->update([$request->input('column') => $request->input('value')]);
-            LogService::log(__METHOD__,'更新问题件',json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__,'更新问题件',json_encode($request->getContent()));
             return ['success' => true];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,'更新问题件error',json_encode($request->getContent()).'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,'更新问题件error',json_encode($request->getContent()).'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false, $e->getMessage()];
         }
     }
@@ -362,10 +362,10 @@ class OrderIssueController extends Controller
         }
         try {
             OrderIssue::query()->whereIn('id', $request->input('ids'))->delete();
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
             return ['success' => true];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent())."||".$e->getMessage()."||".$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent())."||".$e->getMessage()."||".$e->getTraceAsString());
             return ['success' => false,'fail_info' => $e->getMessage()];
         }
     }
@@ -381,7 +381,7 @@ class OrderIssueController extends Controller
                 ->with('items')
                 ->where('logistic_number_return',$request->input('logisticNumberReturn'))
                 ->first();
-            LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
             if(!$rejectedBill){
                 $orderIssue->update(['logistic_number_return' => $request->input('logisticNumberReturn')]);
                 return ['success' => false, 'message' => '退回单号已修改，退回单号没有相应退件信息'];
@@ -391,7 +391,7 @@ class OrderIssueController extends Controller
                 return ['success' => true, 'rejectedBill' => $rejectedBill,'rejectingStatus' =>$orderIssue->rejecting_status];
             }
         } catch (Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__,'error'. json_encode($request->getContent()).'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__,'error'. json_encode($request->getContent()).'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false ,'fail_info' => $e->getMessage()];
         }
     }
@@ -462,7 +462,7 @@ class OrderIssueController extends Controller
                return ['success' => true, 'order' => $secondClientNo =='' ? null : $order];
             }
         } catch (Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()).$e->getMessage().$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()).$e->getMessage().$e->getTraceAsString());
             return  ['success' =>false ,'fail_info' => $e->getMessage()];
         }
     }
@@ -475,10 +475,10 @@ class OrderIssueController extends Controller
         $service = app(OrderIssueService::class);
         try {
             $message = $service->updateSecondLogisticNumber($request->input('id'), $request->logistic_number);
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
             return $message;
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()).$e->getMessage().$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()).$e->getMessage().$e->getTraceAsString());
             return ['success'=>false,$e->getMessage()];
         }
     }
@@ -583,7 +583,7 @@ class OrderIssueController extends Controller
             }
             return ['success'=>true];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'文本导入问题件失败'.json_encode($request->getContent().$e->getMessage().$e->getTraceAsString()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'文本导入问题件失败'.json_encode($request->getContent().$e->getMessage().$e->getTraceAsString()));
             return ['success'=>false,'fail_info'=>$e->getMessage()];
         }
     }

app/Http/Controllers/OrderIssueProcessLogController.php

@@ -30,10 +30,10 @@ class OrderIssueProcessLogController extends Controller
                 if ($log) {
                     $log->user = $log->hasOne(User::class, 'id', 'user_id')->first();
                 }
-                LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
+                app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
                 return ['success' =>true,'data' =>$log ];
             } catch (\Exception $e) {
-                LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+                app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
                 return ['success' => false, 'fail_info' => $e->getMessage()];
             }
         } else {
@@ -46,7 +46,7 @@ class OrderIssueProcessLogController extends Controller
             return ['success'=>false,'fail_info'=>'没有传入对应参数'];
         }
         OrderIssueProcessLog::query()->where('id',$request->input('id'))->delete();
-        LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
+        app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
         return ['success'=>true];
     }
 
@@ -67,10 +67,10 @@ class OrderIssueProcessLogController extends Controller
             foreach ($logs as $log) {
                 $result_data[$log->order_issue_id] =$log;
             }
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()));
             return ['success' => true,'logs' => $result_data];
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,json_encode($request->getContent()).'||'.$e->getMessage()."||".$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->getContent()).'||'.$e->getMessage()."||".$e->getTraceAsString());
             return ['success' => false,$e->getMessage()];
         }
     }

app/Http/Controllers/OrderTrackingController.php

@@ -44,10 +44,10 @@ class OrderTrackingController extends Controller
             return redirect(url('/'));
         try {
             $message = app(OrderTrackingService::class)->updateOrderTracingAndSyc($request->input('id'),$request->input('param'),$request->input('value'));
-            LogService::log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()) );
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()) );
             return $message;
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false];
         }
     }
@@ -58,10 +58,10 @@ class OrderTrackingController extends Controller
             return redirect(url('/'));
         try {
             $message = app(OrderTrackingService::class)->updateOrderTracingAndSyc($request->input('id'),$request->input('param'),$request->input('value'));
-            LogService::log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
             return $message;
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false];
         }
     }
@@ -76,10 +76,10 @@ class OrderTrackingController extends Controller
                 $query->where('id',$request['id']);
             })->first();
             $order->update(['logistic_id'=>$logistic->id]);
-            LogService::log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新成功' . json_encode($request->getContent()));
             return ['success'=>true];
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '更新失败' . json_encode($request->getContent()) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false,'fail_info'=>$e->getMessage()];
         }
 
@@ -87,7 +87,7 @@ class OrderTrackingController extends Controller
 
     public function upload(Request $request)
     {
-        if (!Gate::allows('订单管理-跟踪-仓库编辑'))
+        if (!Gate::allows('订单管理-跟踪-物流公司编辑'))
             return ['success'=>false,'fail_info'=>'没有对应权限'];
         $file=$request->file('file');
         /** @var OrderTracking $orderTracking */
@@ -129,7 +129,7 @@ class OrderTrackingController extends Controller
                 "type"=>$fileExtension,
             ]);
             if ($uploadFile->save()){
-                LogService::log(__METHOD__, '追踪件 图片上传' . __FUNCTION__, json_encode($request));
+                app('LogService')->log(__METHOD__, '追踪件 图片上传' . __FUNCTION__, json_encode($request));
             }
             $uploadFile->url=asset('/storage'.$uploadFile->url);
             return ['success'=>true,'data'=>$uploadFile];
@@ -229,7 +229,7 @@ class OrderTrackingController extends Controller
 
     public function destroyImg(Request $request)
     {
-        if(!Gate::allows('订单管理-跟踪-仓库编辑'))
+        if(!Gate::allows('订单管理-跟踪-物流公司编辑'))
             return ['success'=>false,'error'=>'没有对应权限'];
         $orderTracking = OrderTracking::query()->where('id',$request['id'])->first();
         if(!$orderTracking){
@@ -238,7 +238,7 @@ class OrderTrackingController extends Controller
         try {
             return ['success'=>UploadFile::query()->where('table_name', 'order_trackings')->where('table_id', $orderTracking->order_client_code)->delete()];
         } catch (Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'追踪件删除照片'.json_encode($e->getMessage()).json_encode($e->getTraceAsString()));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'追踪件删除照片'.json_encode($e->getMessage()).json_encode($e->getTraceAsString()));
             return ['success'=>false,'error'=>$e->getMessage()];
         }
     }

app/Http/Controllers/OwnerController.php

@@ -70,7 +70,7 @@ class OwnerController extends Controller
         ]);
         $authority->save();
 
-        $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
         return redirect('maintenance/owner/create')->with('successTip', $request->input('name') ?? '');
     }
 
@@ -126,7 +126,7 @@ class OwnerController extends Controller
         $owner->fill($request->all());
         $owner->update();
         event(new CustomerStored($owner));
-        $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
         return redirect('maintenance/owner/')->with('successTip', "成功修改货主{$owner['name']}！");
     }
 
@@ -145,7 +145,7 @@ class OwnerController extends Controller
         $re = $owner->update([
             "deleted_at" => date('Y-m-d H:i:s'),
         ]);
-        $this->log(__METHOD__, __FUNCTION__, $owner->toJson(), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, __FUNCTION__, $owner->toJson(), Auth::user()['id']);
         return ['success' => $re];
     }
 
@@ -167,7 +167,7 @@ class OwnerController extends Controller
         $owner = Owner::query()->whereNotNull('deleted_at')->where('id', $id)->update([
             "deleted_at" => null,
         ]);
-        $this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
         return ['success' => 'true', 'owner' => $owner];
     }
 }

app/Http/Controllers/PackageController.php

@@ -72,7 +72,7 @@ class PackageController extends Controller
         }
         $accomplishToWMS=new Api\thirdPart\flux\PackageController();
         if($batch_number){
-            $this->log(__METHOD__,'活动波次开始同步_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
+            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);
             OrderPackage::createPackagesFromBatchCode($batch_number,$weight);
@@ -101,7 +101,7 @@ class PackageController extends Controller
                 $package->status="上传异常";
             }
             $package->save();
-            $this->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
+            app('LogService')->log(__METHOD__,'create_'.__FUNCTION__,json_encode($package),Auth::user()['name']);
 //            event(new WeighedEvent($package));
         }else{
             /** @var OrderPackageService */
@@ -120,7 +120,7 @@ class PackageController extends Controller
                 $str = "录入包裹失败！";
                 $str .= $package['logistic_number']?"快递单号：{$package['logistic_number']}":'';
                 $str .= $order_code?", 订单号：{$order_code}":'';
-                $this->log(__METHOD__,__FUNCTION__,json_encode($package).json_encode($result).$str,Auth::user()['name']);
+                app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($package).json_encode($result).$str,Auth::user()['name']);
             }
             $package->save();
             $successTip = $str;

app/Http/Controllers/PaperBoxController.php

@@ -82,7 +82,7 @@ class PaperBoxController extends Controller
         if ($owner_id){
             $paperBox->owners()->sync($owner_id);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/paperBox/index/model')->with('successTip','新纸箱'.$request->input('model').'录入成功');
     }
 
@@ -134,7 +134,7 @@ class PaperBoxController extends Controller
         if ($owner_id){
             $paperBox->owners()->sync($owner_id);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/paperBox/index/model')->with('successTip','纸箱'.$request->input('model').'信息更新成功');
     }
 
@@ -146,10 +146,10 @@ class PaperBoxController extends Controller
     {
         if(!Gate::allows('纸箱-删除')){ return redirect(url('/'));  }
         $paperBox=PaperBox::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($paperBox),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($paperBox),Auth::user()['id']);
         if ($paperBox->delete()){
             $paperBox->owners()->detach();
-            $this->log(__METHOD__,__FUNCTION__,json_encode($paperBox),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($paperBox),Auth::user()['id']);
             return ['success'=>true];
         }else{
             return ['success'=>false];
@@ -173,7 +173,7 @@ class PaperBoxController extends Controller
                 $exception=Cache::get('exception');
                 $a='';
                 for ($i=0;$i<count($exception);$i++){$a.=implode(',',$exception[$i]).'&#10'; };
-                $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
                 return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">'.$a.'</textarea></h1>';
             }
         }else{

app/Http/Controllers/PersonnelController.php

@@ -49,7 +49,7 @@ class PersonnelController extends Controller
         if ($userDutyCheckBefore['type']=='登出'&&$userDutyCheck->type=='登出')return ['result'=>true,'data'=>'已存在出场记录！'];
         if ($type=='登出')$userDutyCheck->verify_user_id=Auth::user()['id'];
         $userDutyCheck->save();
-        $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         $errorMessage=$this->makeOrUpdateLaborReport($userDutyCheck);
         if ($errorMessage)return $errorMessage;
         return ['success'=>true,'data'=>$userDutyCheck];
@@ -61,7 +61,7 @@ class PersonnelController extends Controller
         $laborReportService = app('LaborReportService');
         if (!$laborReport&&$userDutyCheck->type=='登入'){
             $newReport=$userDutyCheck->makeEnteringRecord();
-            $this->log(__METHOD__,"进场创建临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck]));
+            app('LogService')->log(__METHOD__,"进场创建临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck]));
             if ($newReport) event(new ImportEvent($newReport));
         }
         else if(!$laborReport&&$userDutyCheck->type=='登出'){
@@ -74,7 +74,7 @@ class PersonnelController extends Controller
             }
             if ($laborReportYesterday){
                 $exportReport=$laborReportService->exportReplenishToCreateLaborReportData($laborReportYesterday,$userDutyCheck);
-                $this->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReportYesterday,$userDutyCheck]));
+                app('LogService')->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReportYesterday,$userDutyCheck]));
                 if ($exportReport) event(new ExportEvent($exportReport));
             }
         }else if($laborReport){
@@ -83,7 +83,7 @@ class PersonnelController extends Controller
                 return ['result'=>true,'data'=>'该临时工还未退组，暂不可补退场卡!'];
             }
             $exportReport=$laborReportService->exportReplenishToCreateLaborReportData($laborReport,$userDutyCheck);
-            $this->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
+            app('LogService')->log(__METHOD__,"补退场卡修改临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
             if ($exportReport) event(new ExportEvent($exportReport));
         }
     }
@@ -100,7 +100,7 @@ class PersonnelController extends Controller
         if (!$id)return ['error'=>'未找到对应记录！'];
         $processDailyParticipant->status='已审核';
         $processDailyParticipant->update();
-        $this->log(__METHOD__,"任务审核".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"任务审核".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
         return;
     }
 
@@ -140,7 +140,7 @@ class PersonnelController extends Controller
         $userDutyCheck->type=$type;
         $userDutyCheck->verify_user_id=Auth::user()['id'];
         $userDutyCheck->update();
-        $this->log(__METHOD__,"打卡审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"打卡审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         return ["success"=>true,"data"=>$userDutyCheck->verify_user_id];
     }
 
@@ -161,7 +161,7 @@ class PersonnelController extends Controller
         $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->orderBy('id','desc')->first();
         if (!$laborReport){
             $laborReportNew=LaborReport::createLaborReportData($userDutyCheck);
-            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck->user_id,$userDutyCheck->workgroup_id,$userDutyCheck]));
+            app('LogService')->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck->user_id,$userDutyCheck->workgroup_id,$userDutyCheck]));
             //验证五分钟之内重新换组情况
             $checkInDateNow=Carbon::parse($laborReportNew->created_at)->format('Y-m-d H');
             $laborReports=LaborReport::where('user_id',$userDutyCheck->user_id)->where('created_at','like',$checkInDateNow."%")->orderBy('created_at','DESC')->limit(2)->get();
@@ -176,7 +176,7 @@ class PersonnelController extends Controller
             }
         }else if ($laborReport){
             LaborReport::updateLaborReportVerify($laborReport,$userDutyCheck);
-            $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         }
         event(new TeamAuditEvent($userDutyCheck));
         return ["success"=>true,"data"=>$userDutyCheck->group_user_id];
@@ -288,9 +288,9 @@ class PersonnelController extends Controller
         $laborReport=LaborReport::where('user_workgroup_id',$userDutyCheck->workgroup_id)->where('user_id',$userDutyCheck->user_id)->orderBy('id','desc')->first();
         if ($laborReport&&$userDutyCheck->type){
             LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
-            $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
+            app('LogService')->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>true,'data'=>$userDutyCheck];
     }
 }

app/Http/Controllers/ProcessController.php

@@ -166,7 +166,7 @@ class ProcessController extends Controller
         $process->status="已驳回";
         $process->update();
         $process->createOperatorLog('驳回');
-        $this->log(__METHOD__,"驳回二次加工单_".__FUNCTION__,json_encode($process),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"驳回二次加工单_".__FUNCTION__,json_encode($process),Auth::user()['id']);
         return $process;
     }
     //接单
@@ -188,7 +188,7 @@ class ProcessController extends Controller
         $process->status="待加工";
         $process->update();
         $process->createOperatorLog('接单');
-        $this->log(__METHOD__,"接单二次加工单_".__FUNCTION__,json_encode($process),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"接单二次加工单_".__FUNCTION__,json_encode($process),Auth::user()['id']);
         return $process;
     }
     //完成
@@ -201,7 +201,7 @@ class ProcessController extends Controller
         $process->update(['status'=>'交接完成']);
         $process->createOperatorLog('交接完成');
         $processStatistic=$result['data'];
-        $this->log(__METHOD__,"完成二次加工单_".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"完成二次加工单_".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         return ['success'=>true,'data'=>'交接完成'];
     }
     private function statistic($process, $sign_end = false){
@@ -250,7 +250,7 @@ class ProcessController extends Controller
         $processStatistic->gross_profit=$gross_profit;
         $processStatistic->gross_profit_rate=$gross_profit_rate;
         $processStatistic->update();
-        $this->log(__METHOD__,"修改二次加工单统计单_".__FUNCTION__,json_encode($processStatistic),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单统计单_".__FUNCTION__,json_encode($processStatistic),Auth::user()['id']);
         return ['success'=>true,'data'=>$processStatistic];
     }
 
@@ -266,7 +266,7 @@ class ProcessController extends Controller
         $processDaily->update();
         $result=$this->countRemains($processDaily);
         $processDailies=$result['processDailies'];
-        $this->log(__METHOD__,"修改当日产量".__FUNCTION__,json_encode($processDaily),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改当日产量".__FUNCTION__,json_encode($processDaily),Auth::user()['id']);
         $response=[];
         $response['status']='success';
         $response['data']=$processDailies;
@@ -315,7 +315,7 @@ class ProcessController extends Controller
             $processStatistic=ProcessStatistic::find($process_id);
             $processStatistic->ended_at=date('Y-m-d H:i:s');
             $processStatistic->update();
-            $this->log(__METHOD__,"二次加工单待验收".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,"二次加工单待验收".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         }
         return $process_id;
     }
@@ -351,7 +351,7 @@ class ProcessController extends Controller
             'remark'=>$remark,
         ]);
         $processDailyParticipant->save();
-        $this->log(__METHOD__,"添加新参与人".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"添加新参与人".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
         $processDailyParticipant->load(['processDaily'=>function($query){
             $query->with('process');
         }]);
@@ -371,7 +371,7 @@ class ProcessController extends Controller
             $processStatistic=ProcessStatistic::find($processDaily->process_id);
             $processStatistic->started_at=date('Y-m-d H:i:s');
             $processStatistic->update();
-            $this->log(__METHOD__,"二次加工单加工中".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,"二次加工单加工中".__FUNCTION__,json_encode($process)." || ".json_encode($processStatistic),Auth::user()['id']);
         }
         $result['status']="success";
         $result['data']=$processDailyParticipant;
@@ -442,7 +442,7 @@ class ProcessController extends Controller
         $processDailyParticipant->dinner_duration=$request->input('dinner_duration');
         $processDailyParticipant->remark=$request->input('remark');
         $processDailyParticipant->update();
-        $this->log(__METHOD__,"修改参与人".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改参与人".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
         if ($processDailyParticipant->processDaily->process->status=='交接完成'){
             $this->statistic($processDailyParticipant->processDaily->process);
         }
@@ -456,7 +456,7 @@ class ProcessController extends Controller
         if (!$processDailyParticipant) return ['success'=>false];
         $processDailyParticipant->status='已审核';
         $processDailyParticipant->update();
-        $this->log(__METHOD__,"登记工时参与人审核".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"登记工时参与人审核".__FUNCTION__,json_encode($processDailyParticipant),Auth::user()['id']);
         return ['success'=>true,'processDailyParticipant'=>$processDailyParticipant];
     }*/
     //获取全部教程
@@ -481,7 +481,7 @@ class ProcessController extends Controller
         $tutorial=Tutorial::find($tutorial_id);
         if (!$tutorial)return ['success'=>false,'data'=>'未找到相关教程!'];
         $tutorial->processes()->syncWithoutDetaching([$process_id]);
-        $this->log(__METHOD__,"添加教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"添加教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
         return ['success'=>true,'data'=>$tutorial];
     }
     //删除教程关联
@@ -491,7 +491,7 @@ class ProcessController extends Controller
         $tutorial_id=$request->input('tutorial_id');
         if (!$process_id || !$tutorial_id) return ['success'=>false,'data'=>'二次加工或教程传递错误!'];
         DB::table('process_tutorial')->where('process_id',$process_id)->where('tutorial_id',$tutorial_id)->delete();
-        $this->log(__METHOD__,"删除教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"删除教程关联".__FUNCTION__,json_encode($process_id),Auth::user()['id']);
         return ['success'=>true];
     }
     /**
@@ -588,7 +588,7 @@ class ProcessController extends Controller
             'process_id'=>$process->id,
         ]);
         $processStatistic->save();
-        $this->log(__METHOD__,"录入二次加工单".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"录入二次加工单".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         //if ($request->input('tutorials'))$process->tutorials()->sync($request->input('tutorials'));
         return ['success'=>true];
     }
@@ -604,20 +604,20 @@ class ProcessController extends Controller
         if (!$process || $process->status!='交接完成' || count($process->signs)>0)return ['success'=>false,'data'=>'无法操作该二次加工单!'];
         $process->createSignUnitPrice($request->unit_price);
         $sign=$process->createSign('发起修改');
-        $this->log(__METHOD__,"修改二次加工单价格_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单价格_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true,'sign'=>$sign];
     }
 
     //二次加工组审核   两个方法大体相同 拆分原因是为了精确区分权限
     function workGroupVerify(Request $request){
         if(!Gate::allows('二次加工管理-组长确认')){ return ['success'=>false,'data'=>'您无权进行该操作！'];  }
-        $this->log(__METHOD__,"修改二次加工单价格二次加工组确认_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单价格二次加工组确认_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return $this->verify($request->id,'二次加工组确认');
     }
     //二次加工组审核
     function accountantVerify(Request $request){
         if(!Gate::allows('二次加工管理-财务确认')){ return ['success'=>false,'data'=>'您无权进行该操作！'];  }
-        $this->log(__METHOD__,"修改二次加工单价格财务确认_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单价格财务确认_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return $this->verify($request->id,'财务确认');
     }
     private function verify($id,$msg){
@@ -671,7 +671,7 @@ class ProcessController extends Controller
         if (!$process)return ['success'=>false];
         $process->update(['status'=>'待接单']);
         $process->createOperatorLog('审核');
-        $this->log(__METHOD__,"二次加工单审核_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"二次加工单审核_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true];
     }
 
@@ -795,7 +795,7 @@ class ProcessController extends Controller
                 }
             }
         }
-        $this->log(__METHOD__,"编辑二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"编辑二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true];
     }
 
@@ -829,7 +829,7 @@ class ProcessController extends Controller
         }
         $process->save();
         $process->createOperatorLog('回滚');
-        $this->log(__METHOD__,"回滚二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"回滚二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true,'data'=>$process->status];
     }
     //加工完成
@@ -841,7 +841,7 @@ class ProcessController extends Controller
             'status'=>'待验收'
         ]);
         $process->createOperatorLog('加工完成');
-        $this->log(__METHOD__,"标记加工完成_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"标记加工完成_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true,'data'=>'待验收'];
     }
 
@@ -860,7 +860,7 @@ class ProcessController extends Controller
             'status'=>'待交接'
         ]);
         $process->createOperatorLog('质量验收');
-        $this->log(__METHOD__,"质量验收二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"质量验收二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>true,'data'=>'待交接'];
     }
 
@@ -875,7 +875,7 @@ class ProcessController extends Controller
     function recover(Request $request){
         if(!Gate::allows('二次加工管理-删除')){ return redirect('/');  }
         $checkData=$request->checkData;
-        $this->log(__METHOD__,"回收站恢复二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"回收站恢复二次加工单_".__FUNCTION__,json_encode($request->input()),Auth::user()['id']);
         return ['success'=>Process::withTrashed()->whereIn('id',$checkData)->restore()];
     }
     /**
@@ -886,7 +886,7 @@ class ProcessController extends Controller
     public function destroy($id)
     {
         if(!Gate::allows('二次加工管理-删除')){ return redirect('/');  }
-        $this->log(__METHOD__,"删除二次加工单进回收站_".__FUNCTION__,json_encode($id),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"删除二次加工单进回收站_".__FUNCTION__,json_encode($id),Auth::user()['id']);
         return ['success'=>Process::destroy($id)];
     }
 
@@ -923,7 +923,7 @@ class ProcessController extends Controller
         $this->createDeficiencyData($processDailies,$today);
         $processDailies=ProcessDaily::with('processDailyParticipants')->where('process_id',$process_id)
             ->orderBy('date','DESC')->get();
-        $this->log(__METHOD__,"修改二次加工单加工日记录_".__FUNCTION__,json_encode($request),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单加工日记录_".__FUNCTION__,json_encode($request),Auth::user()['id']);
         return ['success'=>true,'data'=>$processDailies];
     }
 
@@ -946,7 +946,7 @@ class ProcessController extends Controller
         $processDailies=ProcessDaily::with('processDailyParticipants')->where('process_id',$process_id)
             ->orderBy('date','DESC')->get();
         $this->createAutomaticSupplement($process_id);
-        $this->log(__METHOD__,"修改二次加工单加工日记录_".__FUNCTION__,json_encode($request),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改二次加工单加工日记录_".__FUNCTION__,json_encode($request),Auth::user()['id']);
         return ['success'=>true,'data'=>$processDailies];
     }
 
@@ -1024,7 +1024,7 @@ class ProcessController extends Controller
                         'code' => $str,
                         'name' => $str
                     ]);
-                    $this->log(__METHOD__,"二次加工单录入导入商品数据时添加货主".__FUNCTION__,json_encode($owner),Auth::user()['id']);
+                    app('LogService')->log(__METHOD__,"二次加工单录入导入商品数据时添加货主".__FUNCTION__,json_encode($owner),Auth::user()['id']);
                 }
             }
             $goods = Commodity::query()->with('barcodes')->where('owner_id',$owner->id)//->whereNull('owner_id') TODO 保留，暂时不知为何限定货主为空
@@ -1052,7 +1052,7 @@ class ProcessController extends Controller
                     }
                 }
             }
-            $this->log(__METHOD__,"二次加工单录入导入商品数据时添加商品及条码".__FUNCTION__,
+            app('LogService')->log(__METHOD__,"二次加工单录入导入商品数据时添加商品及条码".__FUNCTION__,
                 json_encode($goods)." || ".json_encode($commodity_barcodes),Auth::user()['id']);
             $processContent=['bill_type'=>'入库单','commodity_id'=>$goods->id,'wms_code'=>$wmsCode,'amount'=>$amount,
                 'commodity_name'=>$goods->name,'commodity_barcodes'=>$commodity_barcodes,'commodity_sku'=>$goods->sku,

app/Http/Controllers/ProcessStatisticController.php

@@ -14,9 +14,9 @@ class ProcessStatisticController extends Controller
     public function index(Request $request){
         if(!Gate::allows('二次加工管理-查询')){ return redirect('denied');  }
         /** @var ProcessStatisticService $processStatistics */
-        $processStatistics=app("processStatisticService")->paginate($request->input());
+        $processStatistics=app('ProcessStatisticService')->paginate($request->input());
         $owners=app("OwnerService")->getSelection();
-        $processMethods=app("processMethodService")->getSelection();
+        $processMethods=app("ProcessMethodService")->getSelection();
         return view('process.statistic',['processStatistics'=>$processStatistics,'params'=>$request->input(),'owners'=>$owners,'processMethods'=>$processMethods]);
     }
 

app/Http/Controllers/ProvincesController.php

@@ -31,7 +31,7 @@ class ProvincesController extends Controller
         $this->validatorProvinces($request,$id)->validate();
         $provinces=$request->input('Province');
         if(Province::create($provinces)){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/province')->with('successTip','新省份“'.$request->input('Province.name').'”添加成功');
         };
     }
@@ -51,7 +51,7 @@ class ProvincesController extends Controller
         $province=Province::find($id);
         $province->fill($data);
         if ($province->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/province')->with('successTip','省份“'.$request->input('Province.name').'”修改成功');
         }
     }
@@ -60,7 +60,7 @@ class ProvincesController extends Controller
     {
         if(!Gate::allows('省份-删除')){ return redirect(url('/'));  }
         $province=Province::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($province),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($province),Auth::user()['id']);
         $result=$province->delete();
         return ['success'=>$result];
     }

app/Http/Controllers/QualityLabelController.php

@@ -48,7 +48,7 @@ class QualityLabelController extends Controller
         $qualityLabel=new QualityLabel($request->all());
         $qualityLabel->save();
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/qualityLabel/create')->with('successTip',"成功录入品质标签“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -100,7 +100,7 @@ class QualityLabelController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $qualityLabel->fill($request->all());
         $qualityLabel->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/qualityLabel/')->with('successTip',"成功修改品质标签“{$qualityLabel['name']}”！");
     }
 
@@ -114,7 +114,7 @@ class QualityLabelController extends Controller
     public function destroy(QualityLabel $qualityLabel)
     {
         if(!Gate::allows('品质标签-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$qualityLabel->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$qualityLabel->toJson(),Auth::user()['id']);
         $re=$qualityLabel->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/RejectedBillController.php

@@ -99,7 +99,7 @@ class RejectedBillController extends Controller
         app(RejectedBillService::class)->syncOrderIssue($rejectedBill);
 //        $rejectedBill->同步问题件退件状态();
 
-        $this->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','id'=>$rejectedBill['id']];
     }
 
@@ -108,7 +108,9 @@ class RejectedBillController extends Controller
         if(!Gate::allows('退货管理-编辑')){
             return ['success'=>'false','fail_info'=>'没有权限'];
         }
-        if($request['is_loaded']=='null')$request['is_loaded']=null;
+        if($request['is_loaded']==='null'){
+            $request['is_loaded']=null;
+        }
         $errorFields= $this->validator($request->all(),true)->errors()->getMessages();
         if(!empty($errorFields)){
             return ['success'=>'false','error_fields'=>$errorFields,'fail_info'=>'fileds error'];
@@ -119,7 +121,7 @@ class RejectedBillController extends Controller
         app(RejectedBillService::class)->syncOrderIssue($rejectedBill);
 //        $rejectedBill->同步问题件退件状态();
 
-        $this->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true'];
     }
 
@@ -133,7 +135,7 @@ class RejectedBillController extends Controller
         if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"人工确认入库。退单号：".$rejectedBill['logistic_number_return'],Auth::user()['id']);
         $result_TransferToWMS=ReceiveController::accomplishToWMS($rejectedBill);
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         switch ($result_TransferToWMS){
             case 'success':
                 $rejectedBill['is_loaded']=1;
@@ -263,7 +265,7 @@ class RejectedBillController extends Controller
     {
         if(!Gate::allows('退货管理-删除')){ return redirect(url('/'));}
         $re=$rejectedBill->delete();
-        $this->log(__METHOD__,__FUNCTION__,$rejectedBill->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$rejectedBill->toJson(),Auth::user()['id']);
         return ['success'=>$re];
     }
 

app/Http/Controllers/RejectedBillItemController.php

@@ -98,7 +98,7 @@ class RejectedBillItemController extends Controller
         app(RejectedBillService::class)->syncOrderIssue($rejectedBill);
 //        $rejectedBIll->同步问题件();
 //        $rejectedBIll->同步问题件退件状态();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','id'=>$rejectedBillItem['id']];
     }
 
@@ -121,7 +121,7 @@ class RejectedBillItemController extends Controller
             $rejectedBill = RejectedBill::query()->where('id',$rejectedBillItem->id_rejected_bill)->with('orderIssue')->first();
 //            $rejectedBill->同步问题件退件状态();
             app(RejectedBillService::class)->syncOrderIssue($rejectedBill);
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return ['success'=>'true','id'=>$rejectedBillItem['id']];
         }
     }
@@ -142,7 +142,7 @@ class RejectedBillItemController extends Controller
                 $rejectedBill=RejectedBill::find($rejectedBillItem['id_rejected_bill']);
                 $owner = Owner::find($rejectedBill['id_owner']);
                 if(strstr($owner->name??'','笕尚')){
-                    $this->log(__METHOD__,'找不到表','121行');
+                    app('LogService')->log(__METHOD__,'找不到表','121行');
 //                    $rejected=new Rejected();
 //                    $rejected->fill($rejectedBill->toArray());
 //                    $rejected->fill($rejectedBillItem->toArray());
@@ -153,7 +153,7 @@ class RejectedBillItemController extends Controller
                     $sended=$rejectedJianshang->sendRejected($rejected);
                     if(!$sended){
                         echo '<h1>数据发送给笕尚失败，请通知IT相关负责人</h1>';
-                        $this->log(__METHOD__,'error','数据发送给笕尚失败');
+                        app('LogService')->log(__METHOD__,'error','数据发送给笕尚失败');
                         $havingFail++;
                         return false;
                     }
@@ -228,7 +228,7 @@ class RejectedBillItemController extends Controller
         if(!config('api.API_FAKING')){
             $items->each(function(RejectedBillItem $rejectedBillItem)use(&$havingFail,$rejectedBill){
 //                $rejected=new Rejected();
-//                $this->log(__METHOD__,'找不到表','200行');
+//                app('LogService')->log(__METHOD__,'找不到表','200行');
 //                $rejected->fill($rejectedBill->toArray());
 //                $rejected->fill($rejectedBillItem->toArray());
                 $rejected=$rejectedBill->toArray();
@@ -237,7 +237,7 @@ class RejectedBillItemController extends Controller
                 $sended=$rejectedJianshang->sendRejected($rejected);
                 if(!$sended){
                     echo '<h1>数据发送给笕尚失败，请通知IT相关负责人</h1>';
-                    $this->log(__METHOD__,'error_'.__FUNCTION__.'_'.$rejectedBillItem['id'],'数据发送给笕尚失败');
+                    app('LogService')->log(__METHOD__,'error_'.__FUNCTION__.'_'.$rejectedBillItem['id'],'数据发送给笕尚失败');
                     $havingFail++;
                     return false;
                 }
@@ -251,7 +251,7 @@ class RejectedBillItemController extends Controller
         }
 
         if($havingFail>0){
-            $this->log(__METHOD__,'error_'.__FUNCTION__.'_'.$rejectedBill['id'],"$havingFail/{$items->count()} 条记录没有发送成功",Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__.'_'.$rejectedBill['id'],"$havingFail/{$items->count()} 条记录没有发送成功",Auth::user()['id']);
             return false;
         }
         return true;
@@ -318,7 +318,7 @@ class RejectedBillItemController extends Controller
             $rejectedBillItem->delete();
         });
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true'];
     }
 
@@ -327,7 +327,7 @@ class RejectedBillItemController extends Controller
         return Validator::make($data, [
             'id_rejected_bill' => ['required', 'numeric', 'exists:rejected_bills,id'],
             'barcode_goods' => ['required', 'string','max:60'],
-            'name_goods' => ['nullable', 'string','max:50'],
+            'name_goods' => ['nullable', 'string','max:219'],
             'amount' => ['numeric','required', 'max:99999'],
             'id_quality_label' => ['required','numeric',  'max:11'],
             'batch_number' => ['string', 'nullable',],

app/Http/Controllers/RejectedController.php

@@ -10,9 +10,11 @@ use App\Rejected;
 use App\RejectedAnalyzeOwner;
 use App\RejectedBill;
 use App\Services\LogisticService;
+use App\Services\OracleDocAsnHerderService;
 use App\Services\OwnerService;
 use App\Services\QualityLabelService;
 use App\Services\RejectedService;
+use App\Services\StoreService;
 use Carbon\Carbon;
 use Exception;
 use Illuminate\Contracts\Foundation\Application;
@@ -82,7 +84,7 @@ class RejectedController extends Controller
         $rejecteds->each(function(RejectedBill $rejected){
             $rejected->restore();
         });
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','rejecteds'=>$rejecteds];
     }
 
@@ -255,10 +257,10 @@ class RejectedController extends Controller
     {
         if(!Gate::allows('退货管理-录入')){ return redirect(url('/'));  }
         $this->validatorCreate($request->all())->validate();
-        $this->log(__METHOD__,'找不到表','247行');
+        app('LogService')->log(__METHOD__,'找不到表','247行');
         $rejected=new Rejected($request->all());
         $rejected->save();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('rejected/create')->with('successTip',"成功录入退货信息（退单：{$request->input('logistic_number_return')}）");
     }
     public function ajaxCheck(Request $request)
@@ -271,7 +273,7 @@ class RejectedController extends Controller
         if ($re){
             return ['success'=>'true','checked_numbers'=>$rejected['checked_numbers']];
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'false','fail_info'=>'数据更新失败'];
     }
     public function ajaxCheckAll(Request $request)
@@ -293,7 +295,7 @@ class RejectedController extends Controller
                 return ['success'=>'false','fail_info'=>"数据 {$rejected['id']} 更新失败"];
             }
         });
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','rejecteds'=>$rejecteds];
     }
     public function ajaxFinishAll(Request $request)
@@ -308,7 +310,7 @@ class RejectedController extends Controller
                 return ['success'=>'false','fail_info'=>"数据 {$rejected['id']} 更新失败"];
             }
         });
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true'];
     }
     protected function validatorCreate(array $data)
@@ -375,7 +377,7 @@ class RejectedController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $rejected->fill($request->all());
         $rejected->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('rejected/')->with('successTip',"成功修改退货信息“{$rejected['name']}”！");
     }
 
@@ -389,10 +391,10 @@ class RejectedController extends Controller
     public function destroy(Rejected $rejected)
     {
 //        if(!Gate::allows('退货管理-删除')){ return redirect(url('/'));}
-//        $this->log(__METHOD__,__FUNCTION__,$rejectedBill->toJson(),Auth::user()['id']);
+//        app('LogService')->log(__METHOD__,__FUNCTION__,$rejectedBill->toJson(),Auth::user()['id']);
 //        $items=$rejectedBill->items();
 //        $items->delete();
-//        $this->log(__METHOD__,__FUNCTION__,$items->toJson(),Auth::user()['id']);
+//        app('LogService')->log(__METHOD__,__FUNCTION__,$items->toJson(),Auth::user()['id']);
 //        $re=$rejectedBill->delete();
 //        return ['success'=>$re];
     }
@@ -411,7 +413,7 @@ class RejectedController extends Controller
         }
         return response($post,200, [
             "Content-type"=>"application/octet-stream",
-            "Content-Disposition"=>"attachment; filename=运单列表-".date('ymdHis').'.xlsx',
+            "Content-Disposition"=>"attachment; filename=退货单列表-".date('ymdHis').'.xlsx',
         ]);
     }
 
@@ -425,7 +427,7 @@ class RejectedController extends Controller
         $ids=json_decode($ids,true);
         $export=new RejectedExport();
         $export->setIds($ids);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return Excel::download($export,'退货表'.Carbon::now().'.xlsx');
     }
     public function exportExcelOnFilterParams(Request $request)
@@ -443,7 +445,7 @@ class RejectedController extends Controller
         $rejectedBills->get();
         $export=new RejectedExport();
         $export->setRejectedBills($rejectedBills);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return Excel::download($export,'退货表'.Carbon::now().'.xlsx');
 
     }*/
@@ -529,7 +531,7 @@ class RejectedController extends Controller
             'id'=>$id,
             'remark'=>$remark
         ]);
-        $this->log(__METHOD__,'添加或者修改退单备注'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'添加或者修改退单备注'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>true,'status'=>$rejectedBill];
     }
 }

app/Http/Controllers/RoleController.php

@@ -65,7 +65,7 @@ class RoleController extends Controller
             $role->authorities()->sync($authorityIdArr);
         }
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/role/create')->with('successTip',"成功录入角色“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -125,7 +125,7 @@ class RoleController extends Controller
         }else{
             $role->authorities()->sync([]);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/role/')->with('successTip',"成功修改角色“{$role['name']}”！");
     }
 
@@ -139,7 +139,7 @@ class RoleController extends Controller
     public function destroy(Role $role)
     {
         if(!Gate::allows('角色-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$role->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$role->toJson(),Auth::user()['id']);
         $re=$role->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/SortingStationController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\SortingStation;
+use Illuminate\Http\Request;
+
+class SortingStationController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\SortingStation  $sortingStation
+     * @return \Illuminate\Http\Response
+     */
+    public function show(SortingStation $sortingStation)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\SortingStation  $sortingStation
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(SortingStation $sortingStation)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\SortingStation  $sortingStation
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, SortingStation $sortingStation)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\SortingStation  $sortingStation
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(SortingStation $sortingStation)
+    {
+        //
+    }
+}

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -118,12 +118,12 @@ class StoreCheckingReceiveController extends Controller
             if (isset($params['imported_diff_amount']) && $params['imported_diff_amount'] > 0)$is_receive_diff = "是";
             if (isset($params['asn_diff_amount']) && $params['asn_diff_amount'] > 0)$is_asn_diff = "是";
             $item = app('StoreCheckingReceiveItemService')->updateFind($storeCheckingReceiveItem,$params);
-            LogService::log(__METHOD__,"清点数量",json_encode($item,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,"清点数量",json_encode($item,JSON_UNESCAPED_UNICODE));
 
             switch ($storeCheckingReceive->status){
                 case '已导入':
                     $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
-                    LogService::log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
+                    app('LogService')->log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                     break;
                 case '清点中':
                     $res = [];
@@ -139,7 +139,7 @@ class StoreCheckingReceiveController extends Controller
                         $res['is_receive_diff'] = $is_receive_diff;
                     if (count($res) > 0){
                         $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
-                        LogService::log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
+                        app('LogService')->log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                     }
                     break;
             }
@@ -189,7 +189,7 @@ class StoreCheckingReceiveController extends Controller
         switch ($storeCheckingReceive->status){
             case '已导入':
                 $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,['status'=>'清点中']);
-                LogService::log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
+                app('LogService')->log(__METHOD__,"修改盘收任务状态为清点中",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                 break;
             case '清点中':
                 $res = [];
@@ -204,7 +204,7 @@ class StoreCheckingReceiveController extends Controller
                     $res['is_receive_diff'] = $is_receive_diff;
                 if (count($res) > 0){
                     $SCR = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,$res);
-                    LogService::log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
+                    app('LogService')->log(__METHOD__,"修改盘收任务",json_encode($SCR,JSON_UNESCAPED_UNICODE));
                 }
                 break;
         }
@@ -268,7 +268,7 @@ class StoreCheckingReceiveController extends Controller
             'imported_diff_amount'=>null,
             'asn_diff_amount'=>null,
         ]);
-        LogService::log(__METHOD__,"重置盘收任务所有数量","store_checking_receive_id:".$id);
+        app('LogService')->log(__METHOD__,"重置盘收任务所有数量","store_checking_receive_id:".$id);
         return ['success'=>true];
     }
 
@@ -326,12 +326,12 @@ class StoreCheckingReceiveController extends Controller
         }
         if (count($updateItems) > 0){
             app('StoreCheckingReceiveItemService')->batchUpdate($updateItems);
-            LogService::log(__METHOD__,"匹配ASN-批量更新ASN数量",json_encode($updateItems));
+            app('LogService')->log(__METHOD__,"匹配ASN-批量更新ASN数量",json_encode($updateItems));
         }
 
         if (count($deleteItems) > 0){
             app('StoreCheckingReceiveItemService')->destroy($deleteItems);
-            LogService::log(__METHOD__,"重新匹配ASN-删除原有ASN生成数据",json_encode($updateItems));
+            app('LogService')->log(__METHOD__,"重新匹配ASN-删除原有ASN生成数据",json_encode($updateItems));
         }
 
 
@@ -359,7 +359,7 @@ class StoreCheckingReceiveController extends Controller
         $data = app('StoreCheckingReceiveService')->updateFind($storeCheckingReceive,[
             'asn'=>$asn,'is_asn_diff'=>$diffAmount==0 ? "否" : "是",'status'=>'已ASN入库'
         ]);
-        LogService::log(__METHOD__,"修改盘收任务",json_encode($data,JSON_UNESCAPED_UNICODE));
+        app('LogService')->log(__METHOD__,"修改盘收任务",json_encode($data,JSON_UNESCAPED_UNICODE));
         return ['success'=>true, 'data'=>$data];
     }
 
@@ -379,7 +379,7 @@ class StoreCheckingReceiveController extends Controller
         if ($result['success']) $data = $storeCheckingReceiveService->updateFind($storeCheckingReceive,['status'=>"已收货"]);
         else{
             $data = $storeCheckingReceiveService->updateFind($storeCheckingReceive,['status'=>"收货失败"]);
-            LogService::log(__METHOD__,"盘收快速收货失败",json_encode($result['data'],JSON_UNESCAPED_UNICODE)." | ".json_encode($data,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,"盘收快速收货失败",json_encode($result['data'],JSON_UNESCAPED_UNICODE)." | ".json_encode($data,JSON_UNESCAPED_UNICODE));
         }
         return ['success'=>true, 'data'=>$data];
     }
@@ -409,7 +409,7 @@ class StoreCheckingReceiveController extends Controller
             if ($storeCheckingReceive)$this->updateDiffStatus($storeCheckingReceive);
         }
         app('StoreCheckingReceiveItemService')->updateFind($item,$params);
-        LogService::log(__METHOD__,"盘点修改实盘数",'item：'.json_encode($item)."update：",$counted_amount);
+        app('LogService')->log(__METHOD__,"盘点修改实盘数",'item：'.json_encode($item)."update：",$counted_amount);
         return ['success'=>true,"data"=>$data];
     }
 
@@ -431,7 +431,7 @@ class StoreCheckingReceiveController extends Controller
         }
         if (count($update) > 0){
             $scr->update($update);
-            LogService::log(__METHOD__,"修改差异状态",json_encode($scr,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,"修改差异状态",json_encode($scr,JSON_UNESCAPED_UNICODE));
         }
     }
 }

app/Http/Controllers/StoreController.php

@@ -5,6 +5,9 @@ namespace App\Http\Controllers;
 use App\Depository;
 use App\Owner;
 use App\Services\LogService;
+use App\Services\OracleDocAsnDetailService;
+use App\Services\OracleDocAsnHerderService;
+use App\Services\StoreService;
 use App\Store;
 use App\StoreItems;
 use App\Warehouse;
@@ -193,7 +196,7 @@ class StoreController extends Controller
             $result = $this->executeSP($detail,$asnno,$depository_code,$db,$quality,$conn,$sql_sp);
             if (substr($result, 0, 3) != '000') {
                 oci_close($conn);
-                LogService::log(__METHOD__,"快速入库-FLUX收货失败","ASNNO：".$asnno."；ERROR：".$result);
+                app('LogService')->log(__METHOD__,"快速入库-FLUX收货失败","ASNNO：".$asnno."；ERROR：".$result);
                 return ['success' => false, 'data' => $detail->asnlineno.'收货失败,错误代码：'.$result];
             }
             if (!isset($depositories[$detail->lotatt05]) && $detail->lotatt05){
@@ -224,7 +227,7 @@ class StoreController extends Controller
             'status'=>'已入库',
             'remark'=>$asn->notes,
         ]);
-        LogService::log(__METHOD__,"快速入库",json_encode($store));
+        app('LogService')->log(__METHOD__,"快速入库",json_encode($store));
         foreach ($items as $item){
             $item["store_id"] = $store->id;
         }
@@ -288,13 +291,13 @@ class StoreController extends Controller
             $query = DB::raw("UPDATE DOC_ASN_DETAILS SET RECEIVINGLOCATION = ?  WHERE ASNNO = ? AND ASNLINENO = ?");
             $db->update($query,[$depository_code,$detail->asnno,$detail->asnlineno]);
             $db->commit();
-            LogService::log(__METHOD__,"快速入库-修改FULX属性仓","ASNNO：".$asnno."；原仓：".$detail->receivinglocation."；修改为：".$depository_code);
+            app('LogService')->log(__METHOD__,"快速入库-修改FULX属性仓","ASNNO：".$asnno."；原仓：".$detail->receivinglocation."；修改为：".$depository_code);
         }
         if ($quality && ($quality != $detail->lotatt08)){
             $query = DB::raw("UPDATE DOC_ASN_DETAILS SET LOTATT08 = ?  WHERE ASNNO = ? AND ASNLINENO = ?");
             $db->update($query,[$quality,$detail->asnno,$detail->asnlineno]);
             $db->commit();
-            LogService::log(__METHOD__,"快速入库-修改FULX质量状态","ASNNO：".$asnno."；原质量：".$detail->lotatt08."；修改为：".$quality);
+            app('LogService')->log(__METHOD__,"快速入库-修改FULX质量状态","ASNNO：".$asnno."；原质量：".$detail->lotatt08."；修改为：".$quality);
             $In_LotAtt08_C = $quality;
         }
         $stmt = oci_parse($conn, $sql_sp);

app/Http/Controllers/TestController.php

@@ -137,6 +137,13 @@ class TestController extends Controller
 
     }
 
+    function wmsSql()
+    {
+        $owner=Owner::first();
+//        $owner['phone_number'] ?? $owner['phone_number'] = '31115';
+//        $owner->update();
+        dd($owner);
+    }
     function issues()
     {
         /** @var OrderPackageService $orderPackageService */
@@ -161,6 +168,10 @@ class TestController extends Controller
         echo ($inventoryCompareService)->getCreatingMissionCode('安桥主品');
     }
 
+    function tlog(Request $request)
+    {
+        app('LogService')->log(__METHOD__,'cczdelme'.__FUNCTION__,json_encode($request->all()),null);
+    }
     function setCache(Request $request)
     {
         $today = now();
@@ -299,7 +310,7 @@ class TestController extends Controller
                         'status' => $package->status]);
                 if (!$orderPackage) array_push($error, $package->id);
             }
-            LogService::log(__METHOD__, "同步时WMS中未找到这些订单", json_encode($error));
+            app('LogService')->log(__METHOD__, "同步时WMS中未找到这些订单", json_encode($error));
             $id = $packages[count($packages) - 1]->id;
             echo $number . ' a bunch done at:' . now()->toFormattedDateString() . '<br>';
         }
@@ -405,7 +416,7 @@ class TestController extends Controller
                     'status' => $package->status]);
             if (!$orderPackage) array_push($error, $package->id);
         }
-        if (count($error) > 0) LogService::log(__METHOD__, "同步时WMS中未找到这些订单_two", json_encode($error));
+        if (count($error) > 0) app('LogService')->log(__METHOD__, "同步时WMS中未找到这些订单_two", json_encode($error));
     }
 
     function test1()
@@ -457,7 +468,7 @@ class TestController extends Controller
             $processStatistic->gross_profit = $gross_profit;
             $processStatistic->gross_profit_rate = $gross_profit_rate;
             $processStatistic->update();
-            $this->log(__METHOD__, "修改二次加工单统计单_" . __FUNCTION__, json_encode($processStatistic), Auth::user()['id']);
+            app('LogService')->log(__METHOD__, "修改二次加工单统计单_" . __FUNCTION__, json_encode($processStatistic), Auth::user()['id']);
         }
     }
 
@@ -509,8 +520,8 @@ class TestController extends Controller
                 }
             }
             dd($commodityMap,$commodityDel,$commodityTag);
-            LogService::log(__METHOD__,'清理商品',json_encode($logs,JSON_UNESCAPED_UNICODE));
-            LogService::log(__METHOD__,'重新分配商品',json_encode($commodityTag,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,'清理商品',json_encode($logs,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,'重新分配商品',json_encode($commodityTag,JSON_UNESCAPED_UNICODE));
 
             app('InventoryAccountMissionService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存盘点任务
             app('InventoryCompareService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新库存对比
@@ -519,7 +530,7 @@ class TestController extends Controller
             app('StoreCheckingReceiveItemService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新入库盘收一体
             app('OrderPackageCommoditiesService')->batchUpdateItself('commodity_id', $commodityTag);//批量更新订单商品
 
-            LogService::log(__METHOD__,'删除商品与对应条码',json_encode($commodityDel,JSON_UNESCAPED_UNICODE));
+            app('LogService')->log(__METHOD__,'删除商品与对应条码',json_encode($commodityDel,JSON_UNESCAPED_UNICODE));
             CommodityBarcode::query()->whereIn('commodity_id',$commodityDel)->delete();
             Commodity::destroy($commodityDel);
         }
@@ -528,7 +539,7 @@ class TestController extends Controller
     private function cleanBarcode(){
 
         $logCommodityBarcodes = CommodityBarcode::query()->where('code', "")->get();
-        if (count($logCommodityBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-删除空条码", json_encode($logCommodityBarcodes, JSON_UNESCAPED_UNICODE));
+        if (count($logCommodityBarcodes) > 0) app('LogService')->log(__METHOD__, "纠正商品-删除空条码", json_encode($logCommodityBarcodes, JSON_UNESCAPED_UNICODE));
 
         CommodityBarcode::query()->where('code', "")->delete();
         $barcodes = DB::select(DB::raw('select * from commodity_barcodes c
@@ -541,7 +552,7 @@ where (c.code,c.commodity_id) in (select code,commodity_id from commodity_barcod
         }
 
         $logCommodityBarcodes = CommodityBarcode::query()->whereIn('id', $barcodeDelete)->get();
-        if (count($logCommodityBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-删除重复条码", json_encode($logCommodityBarcodes, JSON_UNESCAPED_UNICODE));
+        if (count($logCommodityBarcodes) > 0) app('LogService')->log(__METHOD__, "纠正商品-删除重复条码", json_encode($logCommodityBarcodes, JSON_UNESCAPED_UNICODE));
 
         CommodityBarcode::destroy($barcodeDelete);
     }
@@ -619,16 +630,16 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             app('OrderPackageCommoditiesService')->batchUpdateItself('commodity_id', $updateCommodities);//批量更新订单商品
         }
 
-        if (count($createBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-录入合并条码", json_encode(data_get($createBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
+        if (count($createBarcodes) > 0) app('LogService')->log(__METHOD__, "纠正商品-录入合并条码", json_encode(data_get($createBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
 
         CommodityBarcode::query()->insert($createBarcodes);
         $logCommodityBarcodes = CommodityBarcode::query()->whereIn('commodity_id', $deleteCommodities)->get();
-        if (count($logCommodityBarcodes) > 0) LogService::log(__METHOD__, "纠正商品-删除无用商品条码", json_encode(data_get($logCommodityBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
+        if (count($logCommodityBarcodes) > 0) app('LogService')->log(__METHOD__, "纠正商品-删除无用商品条码", json_encode(data_get($logCommodityBarcodes, '*.id'), JSON_UNESCAPED_UNICODE));
 
         CommodityBarcode::query()->whereIn('commodity_id', $deleteCommodities)->delete();
 
 //        $logCommodities = Commodity::query()->whereIn('id',$deleteCommodities)->get();
-        if (count($deleteCommodities) > 0) LogService::log(__METHOD__, "纠正商品-删除无用商品", json_encode($deleteCommodities, JSON_UNESCAPED_UNICODE));
+        if (count($deleteCommodities) > 0) app('LogService')->log(__METHOD__, "纠正商品-删除无用商品", json_encode($deleteCommodities, JSON_UNESCAPED_UNICODE));
 
         Commodity::destroy($deleteCommodities);
     }

app/Http/Controllers/UnitsController.php

@@ -32,7 +32,7 @@ class UnitsController extends Controller
         $this->validatorUnit($request,$id)->validate();
         $units=$request->input('Unit');
         if(Unit::create($units)){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/unit')->with('successTip','新计量单位“'.$request->input('Unit.name').'”添加成功');
         };
     }
@@ -52,7 +52,7 @@ class UnitsController extends Controller
         $unit=Unit::find($id);
         $unit->fill($data);
         if ($unit->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/unit')->with('successTip','计量单位“'.$request->input('Unit.name').'”修改成功');
         }
     }
@@ -61,7 +61,7 @@ class UnitsController extends Controller
     {
         if(!Gate::allows('计量单位-删除')){ return redirect(url('/'));  }
         $unit=Unit::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($unit),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($unit),Auth::user()['id']);
         $result=$unit->delete();
         return ['success'=>$result];
     }

app/Http/Controllers/UserController.php

@@ -132,7 +132,7 @@ class UserController extends Controller
         }else{
             $user->userWorkgroups()->sync([]);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/user/')->with('successTip',"成功修改用户“{$user['name']}”！");
     }
 
@@ -146,7 +146,7 @@ class UserController extends Controller
     public function destroy(User $user)
     {
         if(!Gate::allows('用户-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$user->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$user->toJson(),Auth::user()['id']);
         $re=$user->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/UserDutyCheckController.php

@@ -46,7 +46,7 @@ class UserDutyCheckController extends Controller
 
         $userLaborToken = $request->cookie('userLaborToken');
         $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
-        if (!$user_id) $this->log(__METHOD__, "进出场扫码(未绑定设备)__" . __FUNCTION__, json_encode($importAndExportQRCodeType));
+        if (!$user_id) app('LogService')->log(__METHOD__, "进出场扫码(未绑定设备)__" . __FUNCTION__, json_encode($importAndExportQRCodeType));
         if ($userLaborToken && $user_id) {
             $userDetail = UserDetail::find($user_id);
             if($userDetail){
@@ -64,7 +64,7 @@ class UserDutyCheckController extends Controller
                     'importAndExportQRCodeType'=>$importAndExportQRCodeType,
                     'userDetail'=>$userDetail,
                 ];
-                $this->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($log));
+                app('LogService')->log(__METHOD__, "进出场扫码__" . __FUNCTION__, json_encode($log));
                 return response()->view('personnel/checking-in/importAndExportSuccess', ['full_name' => $userDetail->full_name, 'checked_at' => $userDutyCheck->checked_at, 'type' => $userDutyCheck->type, 'laravelEchoPrefix' => $laravelEchoPrefix]);
 
             }
@@ -102,7 +102,7 @@ class UserDutyCheckController extends Controller
         $dateNow = Carbon::now()->format('Y-m-d');
         $userDutyCheckOld = UserDutyCheck::query()->with('laborReport')->where('user_id', $user_id)->where('checked_at','like',$dateNow.'%')->orderBy('id','desc')->first();
         $date = date('Y-m-d H:i:s');
-        $this->log(__METHOD__, "提交打卡记录__" . __FUNCTION__, json_encode([$user_id, $date]));
+        app('LogService')->log(__METHOD__, "提交打卡记录__" . __FUNCTION__, json_encode([$user_id, $date]));
         $userDutyCheck = new UserDutyCheck([
             'user_id' => $user_id,
             'checked_at' => $date,
@@ -133,7 +133,7 @@ class UserDutyCheckController extends Controller
             }
             $userDutyCheck->type = "登入";
             $userDutyCheck->save();
-            $this->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+            app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
             return $userDutyCheck;
         }
 
@@ -153,7 +153,7 @@ class UserDutyCheckController extends Controller
             $userDutyCheck->type = '登出';
         }
         $userDutyCheck->save();
-        $this->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
+        app('LogService')->log(__METHOD__, "创建打卡记录" . __FUNCTION__, json_encode($userDutyCheck));
         return $userDutyCheck;
     }
     //去往登记资料页面
@@ -184,7 +184,7 @@ class UserDutyCheckController extends Controller
         $userLabor->update([
             'labor_company_id' => $labor_company_id,
         ]);
-        $this->log(__METHOD__, "更改临时工劳务所信息" . __FUNCTION__, json_encode($userLabor), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, "更改临时工劳务所信息" . __FUNCTION__, json_encode($userLabor), Auth::user()['id']);
         $userDutyCheck=$this->importAndExportDutyCheck($userDetail->user_id,$importAndExportQRCodeType);
         if ($userDutyCheck && $userDutyCheck->isNotImport == true) return "<h1 style='color: darkred;text-align:center'>当前还未入场，不可出场!</h1>";
         if ($userDutyCheck && $userDutyCheck->import == true) return "<h1 style='color: darkred;text-align:center'>您已入场，不可再次入场!</h1>";
@@ -290,7 +290,7 @@ class UserDutyCheckController extends Controller
         $userWorkgroupID = $request->input('userWorkgroupID');
         $userLaborToken = $request->cookie('userLaborToken');
         $user_id = Cache::get('dutyCheckTokenStr_'.$userLaborToken);
-        if (!$user_id)$this->log(__METHOD__, "进组扫码(未绑定设备)__" . __FUNCTION__, json_encode($userWorkgroupID));
+        if (!$user_id)app('LogService')->log(__METHOD__, "进组扫码(未绑定设备)__" . __FUNCTION__, json_encode($userWorkgroupID));
         if ($userLaborToken && $user_id) {
             $dateNow = Carbon::now()->format('Y-m-d');
             $userDutyCheck = UserDutyCheck::where('user_id', $user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();
@@ -302,7 +302,7 @@ class UserDutyCheckController extends Controller
                 'userWorkgroupID'=>$userWorkgroupID,
                 'user_id'=>$user_id,
             ];
-            $this->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($log));
+            app('LogService')->log(__METHOD__, "进组扫码__" . __FUNCTION__, json_encode($log));
         }else{
             return view("personnel/checking-in/enterGroupClock", compact('userWorkgroupID'));
         }
@@ -318,7 +318,7 @@ class UserDutyCheckController extends Controller
         $laborReport = LaborReport::where('user_id', $user_id)->where('user_workgroup_id', null)->where('created_at', 'like', Carbon::now()->format('Y-m-d') . '%')->orderBy('id', 'desc')->first();
         if ($laborReport) {
             $newLaborReport = $laborReportService->enterGroupAndUpdateLaborReport($laborReport, $userWorkgroupID);
-            $this->log(__METHOD__, "当日首次进组更新临时工报表记录__" . __FUNCTION__, json_encode($userWorkgroupID));
+            app('LogService')->log(__METHOD__, "当日首次进组更新临时工报表记录__" . __FUNCTION__, json_encode($userWorkgroupID));
             if (!$newLaborReport) return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
             if ($newLaborReport) event(new ClockinEvent($newLaborReport));
         } else {
@@ -328,7 +328,7 @@ class UserDutyCheckController extends Controller
             if (!$laborReportNow['group_user_id'] && $laborReportNow['user_workgroup_id']==$userWorkgroupID) return "<h1 style='color: darkred;text-align:center'>当前已进组，请等待组长审核！</h1>";
             //此处表示临时工换组操作
             $newLaborReport = $laborReportService->changeGroupAndMakeLaborReport($user_id, $userWorkgroupID);
-            $this->log(__METHOD__, "当日临时工换组新建临时工报表记录__" . __FUNCTION__, json_encode([$user_id, $userWorkgroupID]));
+            app('LogService')->log(__METHOD__, "当日临时工换组新建临时工报表记录__" . __FUNCTION__, json_encode([$user_id, $userWorkgroupID]));
             if (!$newLaborReport) return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
             if ($newLaborReport) event(new ClockinEvent($newLaborReport));
         }
@@ -348,7 +348,7 @@ class UserDutyCheckController extends Controller
         $userDutyCheck = UserDutyCheck::where('user_id', $userDetail->user_id)->where('checked_at', 'like', $dateNow. '%')->orderBy('id', 'desc')->first();
         if (!$userDutyCheck['verify_user_id']) return "<h1 style='color: red;text-align:center'>进场门卫还未审核，暂无法进组！</h1>";
         if ($userDutyCheck->type == '登出') return "<h1 style='color: red;text-align:center'>进场是否未打卡？如若未打，请先返回打进场卡！</h1>";
-        $this->log(__METHOD__, "进组扫码未绑定设备重新绑定__" . __FUNCTION__, json_encode([$userWorkgroupID,$userDetail]));
+        app('LogService')->log(__METHOD__, "进组扫码未绑定设备重新绑定__" . __FUNCTION__, json_encode([$userWorkgroupID,$userDetail]));
         $html=$this->updateLaborReport($userDetail->user_id,$userWorkgroupID,$userLaborToken);
         if ($html)return $html;
     }

app/Http/Controllers/UserLaborController.php

@@ -135,7 +135,7 @@ class UserLaborController extends Controller
         $userDetail->gender=$request->input('gender');
         $userDetail->identity_number=$request->input('identity_number');
         $userDetail->update();
-        $this->log(__METHOD__,"修改用户详情".__FUNCTION__,json_encode($userDetail),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"修改用户详情".__FUNCTION__,json_encode($userDetail),Auth::user()['id']);
         $default_hour_price=$request->input('default_hour_price');
         $laborCompanyName=$request->input('name');
         $labor_company_id=LaborCompany::where('name','=',$laborCompanyName)->value('id');
@@ -144,7 +144,7 @@ class UserLaborController extends Controller
             $userLabor->default_hour_price=$default_hour_price;
             $userLabor->labor_company_id=$labor_company_id;
             $userLabor->update();
-            $this->log(__METHOD__,"修改临时工".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,"修改临时工".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
         }
         return redirect('maintenance/userLabor')->with('successTip','临时工“'.$userDetail->full_name.'”信息修改成功!');
     }
@@ -165,11 +165,11 @@ class UserLaborController extends Controller
             return ['error'=>'未找到对应临时工'];
         }
         $userDetail->delete();
-        $this->log(__METHOD__,"删除用户详情".__FUNCTION__,json_encode($userDetail),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"删除用户详情".__FUNCTION__,json_encode($userDetail),Auth::user()['id']);
         $user->delete();
-        $this->log(__METHOD__,"删除临时工用户".__FUNCTION__,json_encode($user),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"删除临时工用户".__FUNCTION__,json_encode($user),Auth::user()['id']);
         $userLabor->delete();
-        $this->log(__METHOD__,"删除临时工".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"删除临时工".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
         return ['success'=>true];
     }
 }

app/Http/Controllers/UserWorkgroupController.php

@@ -46,7 +46,7 @@ class UserWorkgroupController extends Controller
         ]);
         $sign->save();
         $this->storeAuthority($UserWorkgroup['name'],$UserWorkgroup->id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/userWorkgroup')->with('successTip','新工作组“'.$request->input('name').'”添加成功');
     }
 
@@ -79,7 +79,7 @@ class UserWorkgroupController extends Controller
         if ($sign){
             $sign->mark=$mark;
             $sign->update();
-            $this->log(__METHOD__,'工作组是否需要录入备注'.__FUNCTION__,json_encode($sign),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'工作组是否需要录入备注'.__FUNCTION__,json_encode($sign),Auth::user()['id']);
         }
         if(!$sign){
             $newSign=new Sign([
@@ -89,7 +89,7 @@ class UserWorkgroupController extends Controller
                 'mark'=>$mark,
             ]);
             $newSign->save();
-            $this->log(__METHOD__,'工作组是否需要录入备注'.__FUNCTION__,json_encode($sign),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,'工作组是否需要录入备注'.__FUNCTION__,json_encode($sign),Auth::user()['id']);
         }
         $userWorkgroup['warehouse_id']= $data['warehouse_id'];
         if ($data['name']!=$userWorkgroup->name){
@@ -104,10 +104,10 @@ class UserWorkgroupController extends Controller
             }
             $userWorkgroup->fill($data);
             $userWorkgroup->update();
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }else{
             $userWorkgroup->update();
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         }
         return redirect('maintenance/userWorkgroup')->with('successTip','工作组“'.$request->input('name').'”修改成功');
     }
@@ -116,7 +116,7 @@ class UserWorkgroupController extends Controller
     {
         if(!Gate::allows('工作组-删除')){ return redirect(url('/'));  }
         $UserWorkgroup=UserWorkgroup::with('signs')->find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($UserWorkgroup),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($UserWorkgroup),Auth::user()['id']);
         $sign=$UserWorkgroup->signs;
         $sign->delete();
         $result=$UserWorkgroup->delete();

app/Http/Controllers/WarehouseController.php

@@ -49,7 +49,7 @@ class WarehouseController extends Controller
         $warehouse=new Warehouse($request->all());
         $warehouse->save();
 
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/warehouse/create')->with('successTip',"成功录入仓库“{$request->input('name')}”");
     }
     protected function validatorCreate(array $data)
@@ -102,7 +102,7 @@ class WarehouseController extends Controller
         $this->validatorUpdate($request->all())->validate();
         $warehouse->fill($request->all());
         $warehouse->update();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/warehouse/')->with('successTip',"成功修改仓库“{$warehouse['name']}”！");
     }
 
@@ -116,7 +116,7 @@ class WarehouseController extends Controller
     public function destroy(Warehouse $warehouse)
     {
         if(!Gate::allows('仓库-删除')){ return redirect(url('/'));  }
-        $this->log(__METHOD__,__FUNCTION__,$warehouse->toJson(),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$warehouse->toJson(),Auth::user()['id']);
         $re=$warehouse->delete();
         return ['success'=>$re];
     }

app/Http/Controllers/WaveController.php

@@ -62,7 +62,7 @@ class WaveController extends Controller
         if($meg['fail_info']){
             return $meg;
         }
-        $this->log(__METHOD__,'重置打印标记'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'重置打印标记'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return $meg;
     }
 

app/Http/Controllers/WaybillController.php

@@ -76,7 +76,7 @@ class WaybillController extends Controller
         $this->validatorWaybill($request,$id)->validate();
         /** @var WaybillService */
         $waybill=app('waybillService')->store($request);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('waybill/index')->with('successTip','新运单“'.$waybill->waybill_number.'”录入成功');
     }
 
@@ -151,7 +151,7 @@ class WaybillController extends Controller
             $waybillPayoffParam['gross_profit_rate'] = $waybillPayoffParam['gross_margin']/$waybillPayoffParam['total_receivable'];
             $waybillPayoffService->updateOrCreate($waybillPayoffParam);
         }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('waybill/index')->with('successTip','运单“'.$waybill->waybill_number.'”调度成功');
     }
 
@@ -331,7 +331,7 @@ class WaybillController extends Controller
         $waybill=app('waybillService')->find($id);
         $waybill->fill($data);
         if ($waybill->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
             return redirect('waybill/index')->with('successTip','运单“'.$waybill->waybill_number.'”修改成功');
         }
     }
@@ -351,7 +351,7 @@ class WaybillController extends Controller
             $waybillAuditLog['user']=Auth::user();
             $waybill->status='已审核';
             $result=$waybill->save();
-            $this->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
             return ['success'=>$result,'status'=>$waybill->status,'waybillAuditLog'=>$waybillAuditLog];
         }
         return ['exception'=>'请勿重复审核！'];
@@ -370,7 +370,7 @@ class WaybillController extends Controller
         WaybillAuditLog::whereRaw('waybill_id = ? and audit_stage = ?',[$id,"运单阶段"])->delete();
         $waybill->status='待重审';
         $result=$waybill->save();
-        $this->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($waybill),Auth::user()['id']);
         return ['success'=>$result,'status'=>$waybill->status];
     }
     public function waybillEndAudit(Request $request){
@@ -414,7 +414,7 @@ class WaybillController extends Controller
                     ]);
                 }
             }
-            $this->log(__METHOD__,__FUNCTION__,$waybillPayoffJson,Auth::id());
+            app('LogService')->log(__METHOD__,__FUNCTION__,$waybillPayoffJson,Auth::id());
             return ['success'=>$result,'status'=>$waybill->status,'waybillAuditLog'=>$waybillAuditLog];
         }
         return ['exception'=>'请勿重复审核！'];
@@ -511,7 +511,7 @@ class WaybillController extends Controller
                 "type"=>$fileExtension,
             ]);
             if ($uploadFile->save())
-                $this->log(__METHOD__,'图片上传',json_encode($request),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,'图片上传',json_encode($request),Auth::user()['id']);
             $uploadFile->url=asset('/storage'.$uploadFile->url);
             return ['success'=>true,'data'=>$uploadFile];
         }
@@ -532,7 +532,7 @@ class WaybillController extends Controller
             }
         }
         UploadFile::where('table_name','waybills')->whereIn('table_id',$ids)->delete();
-        $this->log(__METHOD__,'图片删除',json_encode($request),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,'图片删除',json_encode($request),Auth::user()['id']);
         return ['success'=>true];
     }
 
@@ -754,7 +754,7 @@ class WaybillController extends Controller
         $waybills->each(function (Waybill $waybill){
             $waybill->restore();
         });
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','waybills'=>$waybills];
     }
     // 修改运费
@@ -766,7 +766,7 @@ class WaybillController extends Controller
             return ['success'=>'false','fail_info'=>'参数异常'];
         }
         $result = Waybill::where('id',$wayBillId)->update(['fee'=>$waybillFee]);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>$result,'status'=>$result];
     }
     // 修改运输收费
@@ -778,7 +778,7 @@ class WaybillController extends Controller
             return ['success'=>'false','fail_info'=>'参数异常'];
         }
         $result = Waybill::where('id',$wayBillId)->update(['charge'=>$waybillCharge]);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>$result,'status'=>$result];
     }
     // 置顶
@@ -825,7 +825,7 @@ class WaybillController extends Controller
             if ($waybill['warehouse_weight_other']!=$warehouseWeight){
                 $waybill['warehouse_weight_other']=$warehouseWeight;
                 $waybill->update();
-                $this->log(__METHOD__,'刷新仓库计重'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,'刷新仓库计重'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
         }else{
             $warehouseWeight=$waybill['warehouse_weight_other'];

app/Http/Controllers/WaybillPriceModelsController.php

@@ -89,7 +89,7 @@ class WaybillPriceModelsController extends Controller
             if ($waybillPriceModel['initial_weight']==null){unset($waybillPriceModel['initial_weight']);}
             $waybillPriceModel=WaybillPriceModel::create($waybillPriceModel);
             event(new WaybillPriceModelEvent($waybillPriceModel));
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/priceModel/waybillPriceModel')->with('successTip','新计费模型录入成功');
         }else{
             return redirect()->back()->with('successTip','该计费模型已存在');
@@ -121,7 +121,7 @@ class WaybillPriceModelsController extends Controller
         $waybillPriceModel->fill($data);
         if ($waybillPriceModel->save()){
             event(new WaybillPriceModelEvent($waybillPriceModel));
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return redirect('maintenance/priceModel/waybillPriceModel')->with('successTip','新计费模型修改成功');
         }
     }
@@ -130,7 +130,7 @@ class WaybillPriceModelsController extends Controller
     {
         if(!Gate::allows('计费模型-删除')){ return redirect(url('/'));  }
         $waybillPriceModel=WaybillPriceModel::find($id);
-        $this->log(__METHOD__,__FUNCTION__,json_encode($waybillPriceModel),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($waybillPriceModel),Auth::user()['id']);
         $result=$waybillPriceModel->delete();
         return ['success'=>$result];
     }
@@ -153,7 +153,7 @@ class WaybillPriceModelsController extends Controller
                 $exception=Cache::get('exception');
                 $a='';
                 for ($i=0;$i<count($exception);$i++){$a.=implode(',',$exception[$i]).'&#10'; };
-                $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
                 return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">'.$a.'</textarea></h1>';
             }
         }else{

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -18,30 +18,30 @@ class PackageController extends Controller
     public function new_(Request $request)
     {
 //        $requestInputs=$request->all();
-//        $this->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
+//        app('LogService')->log(__METHOD__,'request_'.__FUNCTION__,json_encode($requestInputs),null);
 //        $errors=$this->validatorForNew($requestInputs)->errors();
 //        if(count($errors)>0){
-//            $this->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
+//            app('LogService')->log(__METHOD__,'error2_'.__FUNCTION__,json_encode($requestInputs).'||'.json_encode($errors),null);
 //            return ['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
 //                'errors'=>$errors]];
 //        }
 //        $receiveInputs=$requestInputs['request'];
 //        $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
 //        if (!$receiveInputs['Customer']) {
-//            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
+//            app('LogService')->log(__METHOD__, __FUNCTION__, '富勒没有下发货主！快递单号：'.$receiveInputs['SOReference5'] , null);
 //        }
 //        $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
 //        if (!$owner&&$receiveInputs['SOReference5']) {
 //            Owner::create(['code'=>$receiveInputs['Customer'],'name'=>$receiveInputs['Customer']]);
-//            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主，添加. 快递单号：'.$receiveInputs['SOReference5'] , null);
+//            app('LogService')->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主，添加. 快递单号：'.$receiveInputs['SOReference5'] , null);
 //        }
 //        if (!$receiveInputs['CarrierID']) {
-//            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司！快递单号：'.$receiveInputs['SOReference5'] , null);
+//            app('LogService')->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司！快递单号：'.$receiveInputs['SOReference5'] , null);
 //        }
 //        $logistic=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
 //        if (!$logistic&&$receiveInputs['CarrierID']) {
 //            Logistic::create(['code'=>$receiveInputs['CarrierID'],'name'=>$receiveInputs['CarrierID']]);
-//            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商，添加. 快递单号：' .$receiveInputs['SOReference5'] , null);
+//            app('LogService')->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商，添加. 快递单号：' .$receiveInputs['SOReference5'] , null);
 //        }
 //        if ($package) {
 //            $package->delivery_number = $receiveInputs['palletid'];
@@ -65,7 +65,7 @@ class PackageController extends Controller
 //                $package->status = "上传异常";
 //            }
 //            $package->save();
-//            $this->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
+//            app('LogService')->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
 //            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
 //                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
 //        }
@@ -90,7 +90,7 @@ class PackageController extends Controller
 //                'status'=>'未测量'
 //            ]);
 //        }else{
-//            $this->log(__METHOD__,'fluxPackageApi(no owner or carrier)'.__FUNCTION__,json_encode($request->all()),null);
+//            app('LogService')->log(__METHOD__,'fluxPackageApi(no owner or carrier)'.__FUNCTION__,json_encode($request->all()),null);
 //            $createPackage = new Package([
 //                'logistic_number'=>$receiveInputs['SOReference5'],
 //                'delivery_number'=>$receiveInputs['palletid'],
@@ -126,12 +126,12 @@ class PackageController extends Controller
 //                MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
 //            }
 //            $createPackage->save();
-//            $this->log(__METHOD__, 'success_' . __FUNCTION__, json_encode($request->all()), null);
+//            app('LogService')->log(__METHOD__, 'success_' . __FUNCTION__, json_encode($request->all()), null);
 //            return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
 //                ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
 //        }
 //        MarkPackageExcepted::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
-//        $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
+//        app('LogService')->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
         return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])
             ->setEncodingOptions(JSON_UNESCAPED_UNICODE);
     }
@@ -185,17 +185,17 @@ class PackageController extends Controller
 //            $json=json_encode($json);
 //            $url=url(config('api.flux.package.new'));
 //            $response = Zttp::post($url, json_decode($json));
-//            $this->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
+//            app('LogService')->log(__METHOD__,'Sign'.__FUNCTION__,json_encode($response->json()),null);
 //            $response=$response->json();
 //            $noIssues=true;
 //            if(!$response||!isset($response['response'])||!$response['response']['flag']=='Y'){
 //                $noIssues=false;
 //            }
 //            if($noIssues&&$response['response']['flag']=='Y'){
-//                $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//                app('LogService')->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
 //                return ['result'=>'success'];
 //            }
-//            $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
+//            app('LogService')->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
 //            return ['result'=>'false'];
 //        }catch (\Exception $exception){
 //            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'请求异常：'.$exception->getMessage(),null);
@@ -213,7 +213,7 @@ class PackageController extends Controller
             if(!$docOrderPackingSummary){
                 OracleDocOrderPackingSummary::create(['traceid'=>$package['logistic_number'],'orderno'=>$package['oracleInfo']['orderno'],'grossweight'=>$package['weight'],'addwho'=>'WAS','addtime'=>Carbon::now(),'editwho'=>'WAS','edittime'=>Carbon::now()]);
             }
-            $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,"称重写入WMS成功：".json_encode($package),null);
+            app('LogService')->log(__METHOD__,'SUCCESS_'.__FUNCTION__,"称重写入WMS成功：".json_encode($package),null);
             return ['result'=>'success'];
         }catch (\Exception $exception){
             Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'称重写入WMS请求异常：'.$exception->getMessage(),null);
@@ -232,7 +232,7 @@ class PackageController extends Controller
         OracleDOCWaveHeader::query()->where('waveno',$batchNumber)->update(['userdefine3'=>'Y']);
         OracleIdxAsrsReceive::saveOrUpdateWeightByBatch($batchNumber,$weight);
         OracleDocOrderPackingSummary::saveOrUpdateWeightByBatch($batchNumber,$weight);
-        
+
         Controller::logS(__METHOD__,'SUCCESS_'.__FUNCTION__,'标记WMS波次：'.$batchNumber.',userdefine3="Y"',auth()->user()['id']);
         return ['result'=>true];
     }

app/Http/Controllers/api/thirdPart/flux/ProcessController.php

@@ -180,7 +180,7 @@ class ProcessController extends Controller
         //TODO 保留：根据条码与货主批量二次查找商品
         if (count($commoditiesData) > 0){
             app('CommodityService')->insert($commoditiesData);
-            $this->log(__METHOD__, 'FLUX二次加工单接口录入商品__' . __FUNCTION__, json_encode($commoditiesData), Auth::user()['id']);
+            app('LogService')->log(__METHOD__, 'FLUX二次加工单接口录入商品__' . __FUNCTION__, json_encode($commoditiesData), Auth::user()['id']);
             $commodities=Commodity::query()->whereIn('sku',$commoditiesTem['sku'])->whereIn('owner_id',$commoditiesTem['owner_id'])->get();
             foreach ($commodities as $commodity){
                 if (isset($commodityBarCodeData[$commodity->sku."_".$commodity->owner_id]))
@@ -188,7 +188,7 @@ class ProcessController extends Controller
             }
             if (count($commodityBarCodeData) > 0){
                 app('CommodityBarcodeService')->insert(array_values($commodityBarCodeData));
-                $this->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($commodityBarCodeData), Auth::user()['id']);
+                app('LogService')->log(__METHOD__, 'FLUX二次加工单接口录入商品条码__' . __FUNCTION__, json_encode($commodityBarCodeData), Auth::user()['id']);
             }
         }
     }
@@ -200,7 +200,7 @@ class ProcessController extends Controller
             "code"=>$code
         ]);
         $owner->save();
-        $this->log(__METHOD__, 'FLUX二次加工单接口录入货主__' . __FUNCTION__, json_encode($owner), Auth::user()['id']);
+        app('LogService')->log(__METHOD__, 'FLUX二次加工单接口录入货主__' . __FUNCTION__, json_encode($owner), Auth::user()['id']);
         return $owner;
     }
 

app/Http/Controllers/api/thirdPart/flux/ReceiveController.php

@@ -31,7 +31,7 @@ class ReceiveController extends Controller
         if($isNotAHugeList){
             $errors=$this->validatorForNew($request->all())->errors();
             if(count($errors)>0){
-                $this->log(__METHOD__, 'error_body' . __FUNCTION__, json_encode($request->getContent()));
+                app('LogService')->log(__METHOD__, 'error_body' . __FUNCTION__, json_encode($request->getContent()));
                 (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'fields wrong, see Errors report please.'.'|'.json_encode($request).'|'.json_encode($errors));
                 return response()->json(['response'=>['flag'=>'W','message'=>'fields wrong, see Errors report please.',
                     'errors'=>$errors]])

app/Http/Controllers/api/thirdPart/flux/SortingController.php

@@ -0,0 +1,213 @@
+<?php
+
+namespace App\Http\Controllers\Api\thirdPart\flux;
+
+use App\Batch;
+use App\Commodity;
+use App\Http\Controllers\Controller;
+use App\OracleActAllocationDetails;
+use App\Order;
+use App\OrderBin;
+use App\OrderCommodity;
+use App\Owner;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Zttp\Zttp;
+
+class SortingController extends Controller
+{
+
+    /**
+     * 新增被通知的波次列表（一个以上的波次），并且保存在本地数据库，供get波次使用
+     * 接收：request[(下边newBatch的字段)]
+     * 返回：Response{return{returnFlag(1/0),returnCode(0000/0001),returnDesc,resultInfo}}
+     */
+    public function newBatch(Request $request)
+    {
+        $requestArr=$request->all();
+        app('LogService')->log(__METHOD__, 'issued_' . __FUNCTION__, json_encode($request->all()));
+        !$requestArr?$requestArr=json_decode($request->getContent(),true):false;
+        $errors=$this->newBatchValidator($requestArr)->errors();
+        if(count($errors)>0){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, 'fields wrong, see Errors report please.'.'|'.json_encode($request->all()).'|'.json_encode($errors));
+            return response()->json(['Response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001',
+                'returnDesc'=>':Failure','resultInfo'=>'','errors'=>$errors]]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        $requestBatches = $requestArr['request']?? '';
+        foreach ($requestBatches as $requestBatch){
+            $requestBatch['edittime']&&strpos(trim($requestBatch['edittime']),' ')?$editTimeFormat='Y-m-d H:i:s':$editTimeFormat='YmdHis';
+            $batch=new Batch([
+                'code' => $requestBatch['waveno'],
+                'wms_type' => $requestBatch['batch_type']??'',
+                'wms_status' => $requestBatch['docstatus']??'',
+                'status' => '未处理',
+                'wms_created_at' => $requestBatch['edittime']?Carbon::createFromFormat($editTimeFormat,$requestBatch['edittime']):'',
+            ]);
+            $batch->save();
+            $oracleAlloactions=OracleActAllocationDetails::query()->where('waveno',$requestBatch['waveno'])->get();
+            foreach($requestBatch['order_list'] as $requestOrder){
+                $owner=Owner::query()->where('code',$requestOrder['customerid'])->first();
+                $order=Order::query()->where('code',$requestOrder['docno'])->first();
+                if(!$order){
+                    $order=new Order([
+                        'batch_id' => $batch['id'],
+                        'code' => $requestOrder['docno'],
+                        'owner_id' => $owner['id'],
+                        'wms_status' => $requestOrder['docstatus']??'波次下发',
+                        'status' => '未处理',
+                    ]);
+                }else{
+                    $order['batch_id']= $order['batch_id']??$batch['id'] ;
+                    $order['owner_id']=$order['owner_id']??$owner['owner_id'];
+                    $order['wms_status']=$order['wms_status']??$requestOrder['docstatus']??'波次下发';
+                    $order['status']=$order['status']??'未处理';
+                }
+                $order->save();
+                OrderBin::query()->firstOrCreate([
+                    'order_id' => $order['id'],
+                    'number' => $requestOrder['reservedfield01'],
+                ]);
+                foreach($requestOrder['barcode_list'] as $requestBarcode){
+                    $orderCommodity=OrderCommodity::query()
+                        ->where('order_id',$order['id'])->where('wms_ptltaskid',$requestBarcode['ptltaskid'])->first();
+                    if(!$orderCommodity){
+                        $commodity=Commodity::newCommodityBy_BarcodeOwnerIdNameSku($requestBarcode['alternate_sku1'],$owner['id'],$requestBarcode['descr_c'],$requestBarcode['sku']);
+                        $orderCommodity = new OrderCommodity([
+                            'order_id' => $order['id'],
+                            'commodity_id' => $commodity['id'],
+                            'amount' => $requestBarcode['fmqty_each']??0,
+                            'wms_ptltaskid' => $requestBarcode['ptltaskid'],
+                        ]);
+                        $allocation=$oracleAlloactions->where('orderno',$requestOrder['docno'])->where('sku',$commodity['sku'])->where('qty',$requestBarcode['fmqty_each'])->first();
+                        if($allocation)
+                            $orderCommodity['location'] = $allocation['location'];
+                        $orderCommodity->save();
+                    }
+                }
+            }
+        }
+        return response()->json(['Response'=>['return'=>['returnFlag'=>'1','returnCode'=>'0000',
+            'returnDesc'=>'消息处理成功:Success','resultInfo'=>'']]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+    }
+
+    protected function newBatchValidator(array $data)
+    {
+        return Validator::make($data, [
+            'request' => ['required', 'array', 'min:1'],
+            'request.*.waveno' => ['required', 'string', 'max:191','unique:batches,code'],
+            'request.*.taskprocess' => ['nullable', 'string', 'max:191'],
+            'request.*.edittime' => ['nullable', 'string', 'max:191'],
+            'request.*.batch_type' => ['nullable', 'string', 'max:191'],
+            'request.*.docstatus' => ['nullable', 'string', 'max:191'],
+            'request.*.batch_created_at' => ['nullable', 'string', 'max:191'],
+            'request.*.order_list' => ['required', 'array', 'min:1'],
+            'request.*.order_list.*.docno' => ['required', 'string', 'max:191'],
+            'request.*.order_list.*.customerid' => ['required', 'string', 'max:191','exists:owners,code'],
+            'request.*.order_list.*.docstatus' => ['nullable', 'string', 'max:191'],
+            'request.*.order_list.*.reservedfield01' => ['required',  'max:191'],
+            'request.*.order_list.*.barcode_list' => ['required_unless:request.*.order_list.*.docstatus,90', 'array'],
+            'request.*.order_list.*.barcode_list.*.alternate_sku1' => ['required', 'string', 'max:191'],
+            'request.*.order_list.*.barcode_list.*.descr_c' => ['required', 'string', 'max:191'],
+            'request.*.order_list.*.barcode_list.*.fmqty_each' => ['required', 'numeric'],
+            'request.*.order_list.*.barcode_list.*.ptltaskid' => ['required', 'string', 'max:191'],
+        ]);
+    }
+
+    /**
+     * 新增被通知的取消订单
+     * 接收：docno（订单号）,docstatus（状态，唯一:canceled）
+     * 返回：Response{return{returnFlag(1/0),returnCode(0000/0001),returnDesc,resultInfo}} 1和0000成功，0和0001失败
+     */
+    public function newCanceledOrder(Request $request)
+    {
+        $requestArr=$request->all();
+        !$requestArr?$requestArr=json_decode($request->getContent(),true):false;
+        Controller::logS(__METHOD__,__FUNCTION__,"接收到WMS下发取消单：".$request->getContent());
+        $errors=$this->newCanceledOrderValidator($requestArr)->errors();
+        if(count($errors)>0){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, 'fields wrong, see Errors report please.'.'|'.json_encode($request->all()).'|'.json_encode($errors));
+            return response()->json(['Response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001',
+                'returnDesc'=>':Failure','resultInfo'=>'','errors'=>$errors]]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        $order=Order::query()->where('code',$requestArr['docno'])->first();
+        $order->cancel();
+        return response()->json(['Response'=>['return'=>['returnFlag'=>'1','returnCode'=>'0000',
+            'returnDesc'=>'消息处理成功:Success','resultInfo'=>'']]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+    }
+
+    protected function newCanceledOrderValidator(array $data)
+    {
+        return Validator::make($data, [
+            'docno' => ['required', 'string', 'max:191', 'exists:orders,code'],
+            'docstatus' => ['required', 'string', 'max:191'],
+        ]);
+    }
+
+
+
+    public function informBinAssignment(Batch $batch)
+    {
+        $apiUrl=config('api.flux.inform.binAssignment');
+        if(config('api.faking')){$apiUrl=url(config('api.fake_flux_informBinAssignment'));}
+        $sendingData=['request'=>[]];
+        $batch->orders()->each(function(Order $order)use($batch,&$sendingData){
+            $sendingData['request'][]=[
+                'batch_id'=>$batch['code'],
+                'status'=>'00',//原来是beforeSorting，改成了00
+                'order_id'=>$order['code'],
+                'bin'=>$order->bin()->first()['number']
+            ];
+        });
+        $response=null;
+        try {
+            $response=Zttp::post($apiUrl,$sendingData);
+        }catch (\Exception $e){
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'catch:'.$e->getMessage());
+            return false;
+        }
+        $reJson=$response->json();
+        if(!$reJson || (!isset($reJson['Response'])||!isset($reJson['Response']['return'])) || $reJson['Response']['return']['returnFlag']!='1'){
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'$sending:'.json_encode($sendingData).'$response:'.$response->body());
+            return false;
+        }
+        return true;
+    }
+
+
+    public function informBatchFinished(Batch $batch){
+        $sendingData=['request'=>[]];
+        $batch->orders()->each(function (Order $order)use($batch,&$sendingData){
+            $order->orderCommodities()->each(function (OrderCommodity $orderCommodity)use($batch,$order,&$sendingData){
+                $bin=$order->bin()->first();
+                $sendingData['request'][]=[
+                    'ptltaskid'=>$orderCommodity['wms_ptltaskid'],
+                    'batch_id'=>$batch['code'],
+                    'status'=>'80', //原来是isSorted,改成了80
+                    'order_id'=>$order['code'],
+                    'bin'=>$bin?$bin['number']:'',
+                    'docstatus'=>'success',
+                    'sku'=>$orderCommodity->commodity()->first()?$orderCommodity->commodity()->first()['sku']:'',
+                    'amount'=>'0',
+                ];
+            });
+        });
+        $informApiUrl = config('api.flux.inform.batchFinished');
+        try{
+            $response=Zttp::post($informApiUrl,$sendingData);
+            $result=$response->json();
+            if(!$result||!$result['Response']['return']['returnFlag']||$result['Response']['return']['returnCode']!='0000'){
+                app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'$sending:'.json_encode($sendingData).'|$response:'.$response->body());
+                return false;
+            }
+        }
+        catch(\Exception $e){
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'catch:'.$e->getMessage());
+            return false;
+        }
+        app('LogService')->log(__METHOD__,'temp_'.__FUNCTION__,'$sending:'.json_encode($sendingData).'|$response:'.$response->body());
+        return true;
+    }
+
+
+}

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -24,7 +24,7 @@ class WaybillController extends Controller
         (new Controller())->log(__METHOD__,__FUNCTION__,'WMS requesting:.'.'|'.json_encode($request->all()));
         $errors=$this->validatorForNew($request->all())->errors();
         if(count($errors)>0){
-            $this->log(__METHOD__, 'error_' . __FUNCTION__, json_encode($request->getContent()));
+            app('LogService')->log(__METHOD__, 'error_' . __FUNCTION__, json_encode($request->getContent()));
             (new Controller())->log(__METHOD__,'error_'.__FUNCTION__,'fields wrong, see Errors report please.'.'|'.json_encode($request->all()).'|'.json_encode($errors));
             return response()->json(['response'=>['return'=>['returnFlag'=>'0','returnCode'=>'0001','returnDesc'=>'消息处理失败:Failure','resultInfo'=>'',
                 'errors'=>$errors]]])
@@ -154,7 +154,7 @@ class WaybillController extends Controller
         try{
             $response = Zttp::post($url, $sendingJson);
         }catch (\Exception $exception){
-            $this->log(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
+            app('LogService')->log(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
             return false;
         }
         $responseJson = $response->json();

app/Http/Controllers/api/thirdPart/goodscan/PackageController.php

@@ -25,6 +25,7 @@ class PackageController
             $requestInput[strtolower($key)] = $item;
         }
 
+        app('LogService')->log(__METHOD__,'GoodScan weightApi add'.__FUNCTION__,json_encode($request->getContent()));
         $errors = $this->validatorWeight($requestInput)->errors(); // 参数校验
         if($requestInput['weight'] == '-9.9'){   // 称重异常校验
             LogService::log(__METHOD__,'GoodScan weightApi (Error)'.__FUNCTION__,'异方接口称重伤上传异常[异常值为-9.9，电子秤故障或未连接]'.json_encode($request->getContent()));
@@ -137,7 +138,7 @@ class PackageController
     {
         $fluxController = new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
         if($orderPackage->isActivityBatch()){
-            LogService::log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹：".json_encode($orderPackage),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹：".json_encode($orderPackage),null);
             $params = [
                 'weight'=>$orderPackage['weight'] ?? null,
                 'length'=>$orderPackage['length'] ?? null,
@@ -187,7 +188,7 @@ class PackageController
             return [];
         } catch (\Exception $e) {
             $response=["msg"=>'称重下发修改时发生错误!',json_encode($e),'code'=>500,'data'=>null];
-            LogService::log(__METHOD__,'GoodScan weightApi (Error)'.__FUNCTION__,json_encode($orderPackage).'||'.json_encode($e),null);
+            app('LogService')->log(__METHOD__,'GoodScan weightApi (Error)'.__FUNCTION__,json_encode($orderPackage).'||'.json_encode($e),null);
             return $response;
         }
     }
@@ -215,7 +216,9 @@ class PackageController
         return OracleDOCOrderHeader::query()->with('actAllocationDetails','oracleBASCode')
             ->whereHas('actAllocationDetails',function($query)use($logisticNumber){
                 $query->where('picktotraceid',$logisticNumber);
-            })->orWhere('soreference5',$logisticNumber)->first();
+            })
+//            ->orWhere('soreference5',$logisticNumber)
+            ->first();
     }
 
     /**

app/Http/Controllers/api/thirdPart/haiq/StorageController.php

@@ -49,14 +49,14 @@ class StorageController
         ]];
         $response = Http::post(config('api.haiq.storage.relocate'),$req);
         if (($response["code"] ?? false) && $response["code"] != 200){
-            LogService::log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
+            app('LogService')->log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
             return ['success'=>false,"data"=>$response["errMsg"]];
         }
        if (($response["status"] ?? false) && $response["status"] == 500){
-           LogService::log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
+           app('LogService')->log(__METHOD__,"haiq-料箱出库失败","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
            return ['success'=>false,"data"=>$response["msg"]];
         }
-        LogService::log(__METHOD__,"haiq-料箱出库成功","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
+        app('LogService')->log(__METHOD__,"haiq-料箱出库成功","REQUEST：".json_encode($this->request)." | RESPONSE：".$response);
         return ["success"=>true];
     }
-}
+}

app/Http/Controllers/api/thirdPart/haochuang/SortingController.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Http\Controllers\Api\thirdPart\haochuang;
+
+use App\Batch;
+use App\CommodityBarcode;
+use App\Http\Controllers\Controller;
+use App\Order;
+use App\OrderCommodity;
+use App\SortingStation;
+use App\User;
+use App\UserToken;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+
+class SortingController extends Controller
+{
+
+    function login(Request $request){
+        $name = $request->input('name');
+        $password = $request->input('password');
+        $station_id = $request->input('station_id');
+        $errors=$this->loginValidator($request->all())->errors();
+        if(count($errors)>0){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, json_encode($request->all()).'|'.json_encode($errors));
+            return response()->json(['result'=>'failure','fail_info'=>'error','errors'=>$errors])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        $user=User::query()->where('name',$name)->first();
+        if(!$user||!Hash::check($password, $user['password'])){
+            return ['result'=>'failure','fail_info'=>'认证错误'];
+        }
+        $station = SortingStation::findOrCreate($station_id);
+        $station->login();
+        return ['result'=>'success','token'=>$user->token()];
+    }
+
+    protected function loginValidator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => ['required', 'string', 'max:191'],
+            'password' => ['required', 'string', 'max:191'],
+            'station_id' => ['required', 'string', 'max:191'],
+        ],[
+            'required' => ':attribute 不能为空',
+        ],[
+            'name' => '用户名',
+            'password' => '密码',
+            'station_id' => '设备ID',
+        ]);
+    }
+
+    function process(Request $request){
+        $token = trim($request->input('token'));
+        $station_id = $request->input('station_id');
+        $batch_id = $request->input('batch_id');
+        $errors=$this->processValidator($request->all())->errors();
+        if(count($errors)>0){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, json_encode($request->all()).'|'.json_encode($errors));
+            return response()->json(['result'=>'failure','fail_info'=>'error','errors'=>$errors])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+//        if(!UserToken::getUser($token)){
+//            return ['result'=>'unauthority','fail_info'=>'无效令牌或令牌过期'];
+//        }
+
+        /** @var Batch $batch */
+        $batch=Batch::query()->where('code',$batch_id)->orderBy('id','desc')->first();
+        $data=[
+            'result'=>'success',
+            'station_id'=>$station_id,
+            'batch_id'=>$batch_id,
+            'orders'=>[]
+        ];
+        $ordersSorted=$batch->orders()->get()->sortBy(function(Order $order){
+            return $order->bin()->first()['number'];
+        });
+        $ordersSorted->each(function(Order $order)use(&$data,$request){
+            if($order['status']=='取消')return;
+            $orderData=[
+                'order_id'=>$order['code'],
+                'owner'=>$order->owner()->first()['code'],
+                'status'=>$order['status']=='未处理'?'available':$order['status'],
+                'created_at'=>$order['created_at']->toDateTimeString(),
+                'bin'=>$order->bin()->first()['number'],
+                'barcodes'=>[]
+            ];
+            $order->orderCommodities()->each(function(OrderCommodity $orderCommodity)use(&$orderData,$request){
+                $commodity=$orderCommodity->commodity()->first();
+                if(!$commodity){
+                    app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, '播种位数据准备出错，找不到订单对应的Commodity id的对象'.$orderCommodity['commodity_id'].'，是否表数据在波次生成后丢失？'.json_encode($request->all()));
+                }
+                $barcodeStr=$commodity->barcodes()->get()->map(function(CommodityBarcode $barcode){
+                    return $barcode['code'];
+                })->filter(function($code){
+                    return $code&&(!preg_match('/[\x{4e00}-\x{9fa5}]/u',$code));
+                })->join(',');
+                $orderData['barcodes'][]=[
+                    'id'=>$orderCommodity['id'],
+                    'barcode_id'=>$barcodeStr,
+                    'name'=>$commodity['name'],
+                    'sku'=>$commodity['sku'],
+                    'amount'=>$orderCommodity['amount'],
+                    'location'=>$orderCommodity['location'],
+                ];
+            });
+            $data['orders'][]=$orderData;
+        });
+
+        $sendToWms=(new \App\Http\Controllers\Api\thirdPart\flux\SortingController())->informBinAssignment($batch);
+        if(!$sendToWms){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, '播种位发送给WMS错误：'.json_encode($request->all()));
+            return response()->json(['result'=>'failure','fail_info'=>'播种位发送给WMS错误，请联系管理员检查错误'])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+
+        $station = SortingStation::findOrCreate($station_id);
+        $station->setProcessingBatch($batch);
+        return $data;
+    }
+
+    protected function processValidator(array $data)
+    {
+        return Validator::make($data, [
+            'token' => ['required', 'string', 'max:191'],
+            'station_id' => ['required', 'string', 'max:191'],
+            'batch_id' => ['required', 'string', 'max:191','exists:batches,code'],
+        ],[
+            'required' => ':attribute 不能为空',
+            'exists' => ':attribute 不存在',
+        ],[
+            'station_id' => '设备ID',
+            'batch_id' => '波次号',
+        ]);
+    }
+
+    function done(Request $request){
+        $token = $request->input('token');
+        $station_id = $request->input('station_id');
+        $batch_id = $request->input('batch_id');
+        $errors=$this->doneValidator($request->all())->errors();
+        $failInfo='';
+        foreach ($errors as $error){$failInfo.=$error[0].'; ';}
+        if(count($errors)>0){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, json_encode($request->all()).'|'.json_encode($errors));
+            return response()->json(['result'=>'failure','fail_info'=>$failInfo,'errors'=>$errors])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        if(!UserToken::getUser($token)){
+            return ['result'=>'unauthority','fail_info'=>'无效令牌或令牌过期'];
+        }
+        $batch=Batch::query()->where('code',$batch_id)->first();
+        if($batch->status=='已处理'){
+            app('LogService')->log(__METHOD__,'alert_'.__FUNCTION__,$batch['code'].'重复发送，波次已处理');
+            return ['result'=>'failure','fail_info'=>$batch['code'].'重复发送，波次已处理'];
+        }
+        $sendToWms=(new \App\Http\Controllers\Api\thirdPart\flux\SortingController())->informBatchFinished($batch);
+        if(!$sendToWms){
+            app('LogService')->log(__METHOD__, 'error' . __FUNCTION__, '发送给WMS错误：'.json_encode($request->all()));
+            return response()->json(['result'=>'failure','fail_info'=>'发送给WMS错误，请联系管理员检查错误'])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        $batch->setProcessed();
+        $station = SortingStation::query()->where('name',$station_id)->first();
+        $station->clearProcessingBatch();
+        return ['result'=>'success','batch_id'=>$batch_id];
+    }
+    protected function doneValidator(array $data)
+    {
+        return Validator::make($data, [
+            'token' => ['required', 'string', 'max:191'],
+            'station_id' => ['required', 'string', 'max:191','exists:sorting_stations,name'],
+            'batch_id' => ['required', 'string', 'max:191','exists:batches,code'],
+        ],[
+            'required' => ':attribute 不能为空',
+            'exists' => ':attribute 不存在',
+        ],[
+            'station_id' => '设备ID',
+            'batch_id' => '波次号',
+        ]);
+    }
+
+}

app/Http/Controllers/api/thirdPart/jianshang/RejectedController.php

@@ -35,14 +35,14 @@ class RejectedController extends Controller
             $goods_name,$logistic_name_return,$logistic_number,$logistic_number_return,$order_number,
             $quality_label,$sender_mobile,$sender_name);
         if(!$json){
-            $this->log(__METHOD__,'error'.'_'.$logistic_number_return,"没有返回");
+            app('LogService')->log(__METHOD__,'error'.'_'.$logistic_number_return,"没有返回");
             return false;
         }
         if(!$json['success']){
-            $this->log(__METHOD__,'error'.'_'.$logistic_number_return,"返回错误：".json_encode($json));
+            app('LogService')->log(__METHOD__,'error'.'_'.$logistic_number_return,"返回错误：".json_encode($json));
             return false;
         }else{
-            $this->log(__METHOD__,'JianshangResponse'.'_'.$logistic_number_return,json_encode($json));
+            app('LogService')->log(__METHOD__,'JianshangResponse'.'_'.$logistic_number_return,json_encode($json));
         }
         return $json;
     }
@@ -72,7 +72,7 @@ class RejectedController extends Controller
                                       $goods_name,$logistic_name_return,$logistic_number,$logistic_number_return,$order_number,
                                       $quality_label,$sender_mobile,$sender_name){
         if(env('api_faking')){
-            $this->log(__METHOD__,'error_'.__FUNCTION__,'API FAKING');
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'API FAKING');
             return false;
         }
         $data="{\"amount\":\"$amount\", \"created_at\":\"$created_at\", \"fee_collected\":\"$fee_collected\",
@@ -101,13 +101,13 @@ class RejectedController extends Controller
             'timestamp'=>$timestamp,
             'Content-Type'=>'application/json'
         ])->post($url,json_decode($data,true));
-        $this->log(__METHOD__,__FUNCTION__,$data);
+        app('LogService')->log(__METHOD__,__FUNCTION__,$data);
         if(!$response){
-            $this->log(__METHOD__,'error_'.__FUNCTION__,'回复异常：'.$response->body());
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'回复异常：'.$response->body());
             return false;
         }
         if(!$response->json()){
-            $this->log(__METHOD__,'error_'.__FUNCTION__,'json为空：'.$response->body());
+            app('LogService')->log(__METHOD__,'error_'.__FUNCTION__,'json为空：'.$response->body());
             return false;
         }
         return $response->json();
@@ -204,7 +204,7 @@ class RejectedController extends Controller
         $timestamp=intval(microtime(true)*1000);
         $nonce=md5(microtime(true));
         $sign=$sortParamsAndMd5(json_decode($data,true),$timestamp,$nonce,config('api.sign_key_rejected_send_jianshang'));
-        $this->log(__METHOD__,'笕尚接口发送请求：',$data);
+        app('LogService')->log(__METHOD__,'笕尚接口发送请求：',$data);
         $url=config('api.url_rejected_send_jianshang2');
         if(env('api_faking'))$url=url(config('api.fakingUrl_rejected_send_jianshang'));
         try{
@@ -216,14 +216,14 @@ class RejectedController extends Controller
                 'Content-Type'=>'application/json'
             ])->post($url,json_decode($data,true));
         }catch (\Exception $e){
-            $this->log(__METHOD__,'笕尚接口返回异常！！：',$e->getMessage().'||'.json_encode($data));
+            app('LogService')->log(__METHOD__,'笕尚接口返回异常！！：',$e->getMessage().'||'.json_encode($data));
             $response=false;
         }
         if(!$response){
-            $this->log(__METHOD__,'笕尚接口返回异常！！：',$response->body());
+            app('LogService')->log(__METHOD__,'笕尚接口返回异常！！：',$response->body());
             return false;
         }
-        $this->log(__METHOD__,'笕尚接口返回：',$response->body());
+        app('LogService')->log(__METHOD__,'笕尚接口返回：',$response->body());
         return $response->json();
     }
 

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -27,7 +27,7 @@ class PackageController extends Controller
 //        $errors=$this->validatorWeight($request)->errors();
 //
 //        if (count($errors)>0){
-//            $this->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
+//            app('LogService')->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
 //            $response=["msg"=>$errors,"code"=>500,"data"=>null];
 //            return json_encode($response);
 //        }
@@ -40,7 +40,7 @@ class PackageController extends Controller
 //                'status'=>'在线'
 //            ]);
 //            $measuringMachine->save();
-//            $this->log(__METHOD__,'weightApi(new measuring machine)'.__FUNCTION__,json_encode($request),null);
+//            app('LogService')->log(__METHOD__,'weightApi(new measuring machine)'.__FUNCTION__,json_encode($request),null);
 //        }else{
 //            $measuringMachineStatus=new MeasuringMachine();
 //            $measuringMachineStatus->changeStatus($measuringMachine);
@@ -82,7 +82,7 @@ class PackageController extends Controller
 //                $package->bulk=$max*$centre*$min;
 //                $package->weighed_at=$reqDate;
 //                $package->status="未上传";
-//                $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
+//                app('LogService')->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
 //                $package->save();
 //                $result=$apiController->accomplishToWMS($package);
 //                if ($result['result']){
@@ -113,7 +113,7 @@ class PackageController extends Controller
 //                                "reqDate"=>$reqDate,
 //                                "resDate"=>Carbon::now()]
 //                        ];
-//            $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'|'.json_encode($response),null);
+//            app('LogService')->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'|'.json_encode($response),null);
 //            return json_encode($response,JSON_UNESCAPED_UNICODE);
 //        }
 //        if (!$package){
@@ -134,7 +134,7 @@ class PackageController extends Controller
 //            $createPackage->fetchPaperBox($max, $centre, $min);
 //            $result=$apiController->accomplishToWMS($createPackage);
 //            if(!$result['result']){
-//                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($createPackage),null);
+//                app('LogService')->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($createPackage),null);
 //                $response=["msg"=>"写入WMS失败!","code"=>500,"data"=>null];
 //                return json_encode($response,JSON_UNESCAPED_UNICODE);
 //            }
@@ -153,18 +153,19 @@ class PackageController extends Controller
 //                        "reqDate"=>$reqDate,
 //                        "resDate"=>Carbon::now()]
 //                ];
-//                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
+//                app('LogService')->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
 //                return json_encode($response,JSON_UNESCAPED_UNICODE);
 //            }
 //
 //            $response=["msg"=>"保存时发生错误（未下发）!","code"=>500,"data"=>null];
-//            $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
+//            app('LogService')->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response),null);
 //            return json_encode($response,JSON_UNESCAPED_UNICODE);
 //        }
 //    }
 
     public function new_(Request $requestInitial){
         $request=[];
+        app('LogService')->log(__METHOD__,'cczdelme'.__FUNCTION__,json_encode($requestInitial->all()),null);
         foreach ($requestInitial->all() as $k=>$v){
             $request[strtolower($k)]=$v;
         }
@@ -172,7 +173,7 @@ class PackageController extends Controller
         $errors=$this->validatorWeight($request)->errors();
 
         if (count($errors)>0){
-            $this->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
+            app('LogService')->log(__METHOD__,'error'.__FUNCTION__,json_encode($request).'||'.json_encode($errors),null);
             return json_encode(["msg"=>$errors,"code"=>500,"data"=>null]);
         }
 
@@ -197,14 +198,14 @@ class PackageController extends Controller
             $package->fetchPaperBox();
             $package['bulk']=$edges[0]*$edges[1]*$edges[2];
             if ($package->isActivityBatch()){//处理活动波次
-                $this->log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹：".json_encode($package),null);
+                app('LogService')->log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹：".json_encode($package),null);
                 $package->unifyThisMeasureUnderSameBatch();
                 $result=$fluxController->markWMSOnBatch($package['batch_number'], $request['weight']);
                 if(!$result['result']){
                     $package->status="上传异常";
                 }
             }else{
-                $this->log(__METHOD__,__FUNCTION__,"写入包裹至WMS：".json_encode($package),null);
+                app('LogService')->log(__METHOD__,__FUNCTION__,"写入包裹至WMS：".json_encode($package),null);
                 try{
                     $result=$fluxController->accomplishToWMS($package);
                     if ($result['result']){
@@ -230,7 +231,7 @@ class PackageController extends Controller
                 }
             }catch (\Exception $e){
                 $response=["msg"=>"称重下发修改时发生错误!".json_encode($e),"code"=>500,"data"=>null];
-                $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.json_encode($e),null);
+                app('LogService')->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.json_encode($e),null);
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
         }
@@ -271,14 +272,14 @@ class PackageController extends Controller
                 $package->save();
             }catch (\Exception $e){
                 $response=["msg"=>$e->getMessage(),"code"=>500,"data"=>$e->getTraceAsString()];
-                $this->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.$e->getTraceAsString(),null);
+                app('LogService')->log(__METHOD__,'weightApi(ERROR)'.__FUNCTION__,json_encode($request).'||'.json_encode($response).'||'.$e->getTraceAsString(),null);
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
             $result=$fluxController->accomplishToWMS($package);
             if(!$package['batch_number'])
                 FetchPackageFromOracle::dispatch($package)->delay(Carbon::now()->addMinutes(1440));
             if(!$result['result']){
-                $this->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($package),null);
+                app('LogService')->log(__METHOD__,'weightApi'.__FUNCTION__,json_encode($request).'||'.json_encode($package),null);
                 $response=["msg"=>"写入WMS失败!","code"=>500,"data"=>null];
                 return json_encode($response,JSON_UNESCAPED_UNICODE);
             }
@@ -296,7 +297,7 @@ class PackageController extends Controller
                     "reqDate"=>$reqDate,
                     "resDate"=>Carbon::now()]
             ];
-            $this->log(__METHOD__,__FUNCTION__,"下发写入包裹成功：".json_encode($request).'|'.json_encode($response),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,"下发写入包裹成功：".json_encode($request).'|'.json_encode($response),null);
         return json_encode($response,JSON_UNESCAPED_UNICODE);
     }
 

app/Http/Controllers/api/thirdPart/weixin/WxController.php

@@ -102,7 +102,7 @@ class WxController extends Controller
         $waybill->carrier_weight_other=$carrier_weight_other;
 
         if ($waybill->save()){
-            $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
+            app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             return ['success'=>true];
         }
         else return ['success'=>false];

app/Http/Controllers/api/thirdPart/weixin/WxLoginController.php

@@ -17,7 +17,7 @@ class WxLoginController extends Controller
         if ($user){
             $isRight=Hash::check($pwd,$user['password']);
             if ($isRight){
-                $this->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user->id);
+                app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),$user->id);
                 return ['api_token'=>$user->token()];
             }
             else return ['api_token'=>''];

app/Imports/RejectedImport.php

@@ -127,7 +127,7 @@ class RejectedImport implements ToCollection, WithHeadingRow
                 $owner = Owner::find($rejectedBill['id_owner']);
                 if(strstr($owner->name??'','笕尚')){
                     $rejected=new Rejected();
-                    $this->log(__METHOD__,'找不到表','132行');
+                    app('LogService')->log(__METHOD__,'找不到表','132行');
                     $rejected->fill($rejectedBill->toArray());
                     $rejected->fill($item->toArray());
                     $rejectedJianshang=new RejectedController();

app/Imports/StoreCheckingReceiveImport.php

@@ -177,7 +177,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                 }
                 if (count($barcodes) > 0){
                     $commodityBarcodeService->insert($barcodes);
-                    LogService::log(__METHOD__,"盘收导入补录条码",json_encode($barcodes));
+                    app('LogService')->log(__METHOD__,"盘收导入补录条码",json_encode($barcodes));
                 }
             }
 
@@ -215,7 +215,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                     /** @var CommodityService $commodityService */
                     $commodityService = app('CommodityService');
                     $commodityService->insert($createCommodities);
-                    LogService::log(__METHOD__,"盘收录入临时商品",json_encode($createCommodities,JSON_UNESCAPED_UNICODE));
+                    app('LogService')->log(__METHOD__,"盘收录入临时商品",json_encode($createCommodities,JSON_UNESCAPED_UNICODE));
 
                     //拿到商品ID录入条码
                     $barcodes = [];
@@ -236,7 +236,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
                     }
                     if (count($barcodes) > 0){
                         $commodityBarcodeService->insert(array_unique($barcodes));
-                        LogService::log(__METHOD__,"盘收导入录入条码",json_encode($barcodes));
+                        app('LogService')->log(__METHOD__,"盘收导入录入条码",json_encode($barcodes));
                     }
                 }
             }
@@ -251,7 +251,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
             "created_at" => date('Y-m-d H:i:s'),
             'status' => "已导入",
         ]);
-        LogService::log(__METHOD__,"导入盘收任务-录入盘收任务",json_encode($storeCheckingReceive,JSON_UNESCAPED_UNICODE));
+        app('LogService')->log(__METHOD__,"导入盘收任务-录入盘收任务",json_encode($storeCheckingReceive,JSON_UNESCAPED_UNICODE));
         $storeCheckingReceive->owner_name = $owner_name;
 
         foreach ($items as &$item){
@@ -259,7 +259,7 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
         }
 
         app('StoreCheckingReceiveItemService')->insert($items);
-        LogService::log(__METHOD__,"导入盘收任务-批量录入盘收记录",json_encode($items,JSON_UNESCAPED_UNICODE));
+        app('LogService')->log(__METHOD__,"导入盘收任务-批量录入盘收记录",json_encode($items,JSON_UNESCAPED_UNICODE));
 
         Cache::put("storeCheckingReceive",["success"=>true,"data"=>$storeCheckingReceive,"errors"=>$errors],86400);
         return true;

app/InventoryAccount.php

@@ -12,10 +12,10 @@ class InventoryAccount extends Model
     use ModelTimeFormat;
     use SoftDeletes;
     protected $fillable=[
-        'id','owner_id','type', 'start_at', 'end_at','total','processed','difference','returned','deleted_at','created_at','status','remark',
+        'id','owner_id','type', 'start_at', 'end_at','total','processed','difference','returned','deleted_at','created_at','status','remark','auditor'
     ];
     protected $appends = [
-            'surplus','check_surplus'
+            'surplus','check_surplus','ignored'
     ];
     public function creator(){
         return $this->hasOne('App\Sign','signable_id','id')
@@ -24,16 +24,22 @@ class InventoryAccount extends Model
     public function owner(){
         return $this->belongsTo('App\Owner','owner_id','id');
     }
+    public function userAuditor(){
+        return $this->belongsTo('App\User','auditor','id');
+    }
     public function inventoryMissions(){
         return $this->belongsTo('App\InventoryAccountMission','id','inventory_account_id');
     }
 
     public function getSurplusAttribute()
     {
-        return $this['total'] ? $this['total']-$this['processed']:0;
+        return $this['total'] ? $this['total']-($this['processed']+$this['ignored']):0;
     }
     public function getProcessedAmount(){
-        return $this->inventoryMissions()->whereIn('checked',['是','跳过','确认差异','已复核'])->where('inventory_account_id',$this['id'])->count();
+        return $this->inventoryMissions()->whereIn('checked',['是','确认差异','已复核'])->where('inventory_account_id',$this['id'])->count();
+    }
+    public function getIgnoredAttribute(){
+        return $this->inventoryMissions()->where('checked','跳过')->where('inventory_account_id',$this['id'])->count();
     }
     //复盘剩余数
     public function getCheckSurplusAttribute()

app/OracleDOCASNDetail.php

@@ -17,4 +17,18 @@ class OracleDOCASNDetail extends Model
     public function oracleDocAsnHeader(){
         return $this->belongsTo('App\OracleDOCASNHeader','asnno','asnno');
     }
+    public function lineStatus()
+    {
+        return $this->hasOne(OracleBasCode::class,'code','linestatus')
+            ->where('codeid','ASN_STS');
+    }
+    public function qualityStatus()
+    {
+        return $this->hasOne(OracleBasCode::class,'code','lotatt08')
+            ->where('codeid','QLT_STS');
+    }
+    public function basSku()
+    {
+        return $this->hasOne(OracleBasSKU::class,'sku','sku');
+    }
 }

app/OracleDOCASNHeader.php

@@ -10,4 +10,24 @@ class OracleDOCASNHeader extends Model
     use ModelTimeFormat;
     protected $connection="oracle";
     protected $table="Doc_ASN_Header";
+
+    public function asnType()
+    {
+        return $this->hasOne(OracleBasCode::class,'code','asntype')
+            ->where('codeid','ASN_TYP');
+    }
+
+    public function asnStatus()
+    {
+        return $this->hasOne(OracleBasCode::class,'code','asnstatus')
+            ->where('codeid','ASN_STS');
+    }
+
+    public function asnDetails()
+    {
+        return $this->hasMany(OracleDOCASNDetail::class,'asnno','asnno')
+            ->select('asnno','asnlineno','customerid','sku','skudescrc','linestatus','lotatt08','lotatt05','expectedqty','addtime','edittime');
+    }
+
+
 }

app/Order.php

@@ -11,6 +11,7 @@ class Order extends Model
     use ModelTimeFormat;
 
     protected $fillable = [
+        'id', 'batch_id',  'owner_id', 'status',
         'created_at', 'code', 'shop_id', 'owner_id', 'client_code',
         'logistic_id', 'consignee_name', 'consignee_phone', 'province',
         'city', 'district', 'address', 'wms_status','status','warehouse_id','wms_edittime'];
@@ -58,6 +59,18 @@ class Order extends Model
         return $this->hasOne(Warehouse::class, 'id', 'owner_id');
 
     }
+    public function orderCommodities(){
+        return $this->hasMany('App\OrderCommodity','order_id','id');
+    }
+    public function bin(){
+        $bin= $this->hasOne('App\OrderBin','order_id','id');
+        if($bin->count()>0)return $bin;
+        $this->batch()->first()->assignBins();
+        return $this->hasOne('App\OrderBin','order_id','id');
+    }
+    public function batch(){
+        return $this->belongsTo('App\Batch', 'batch_id','id');
+    }
 
     public function getLogisticNumbersAttribute()
     {

app/OrderBin.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OrderBin extends Model
+{
+    protected $fillable = [
+        'order_id', 'number',
+    ];
+}

app/OrderCommodity.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\Model;
+
+class OrderCommodity extends Model
+{
+    protected $fillable = [
+        'id', 'order_id','commodity_id', 'amount','wms_ptltaskid','location'
+    ];
+    protected $appends=['barcode','name','sku'];
+    public function order(){
+        return $this->belongsTo('App\Order', 'order_id','id');
+    }
+    public function commodity(){
+        return $this->hasOne('\App\Commodity','id','commodity_id');
+    }
+    public function getBarcodeAttribute(){
+        $commodity=$this->commodity()->first();
+        if($commodity)return $commodity['barcode'];
+        return '';
+    }
+    public function getNameAttribute(){
+        $commodity=$this->commodity()->first();
+        if($commodity)return $commodity['name'];
+        return '';
+    }
+    public function getSkuAttribute(){
+        $commodity=$this->commodity()->first();
+        if($commodity)return $commodity['sku'];
+        return '';
+    }
+}

app/OrderPackage.php

@@ -109,7 +109,7 @@ class OrderPackage extends Model
             /** @var OrderService */
             $order = app('OrderService')->logisticNumberFirstOrCreateOrder($resultOracleObj['soreference5']);
             if (!$order){
-                LogService::log(__METHOD__,"此包裹在WMS未找到order",json_encode($resultOracleObj),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,"此包裹在WMS未找到order",json_encode($resultOracleObj),Auth::user()['id']);
                 continue;
             }
             array_push($packages,[
@@ -143,7 +143,7 @@ class OrderPackage extends Model
         DB::transaction(function ()use($newPackages){
             OrderPackage::query()->insert($newPackages);
         });
-        LogService::log(__METHOD__,"批量录入包裹成功",json_encode($packages),Auth::user()['id']);
+        app('LogService')->log(__METHOD__,"批量录入包裹成功",json_encode($packages),Auth::user()['id']);
     }
     public function unifyThisMeasureUnderSameBatch(){
         $this->fetchPaperBox();

app/Owner.php

@@ -37,6 +37,7 @@ class Owner extends Model
             return $query->where('id','0');
         }
         $ownerIds=app('UserService')->getPermittingOwnerIds($user);
+        if(empty($ownerIds))return $query;
         return $query->whereIn('id',$ownerIds);
     }
 

app/Providers/AppServiceProvider.php

@@ -14,10 +14,12 @@ use App\Services\CustomerService;
 use App\Services\DepositoryService;
 use App\Services\InventoryAccountMissionService;
 use App\Services\InventoryCompareService;
+use App\Services\LogService;
 use App\Services\OracleBasCustomerService;
 use App\Services\OracleBasSkuService;
 use App\Services\OracleDocAsnDetailService;
 use App\Services\OracleDOCOrderHeaderService;
+use App\Services\OracleDocAsnHerderService;
 use App\Services\OrderIssuePerformanceService;
 use App\Services\AllInventoryService;
 use App\Services\InventoryDailyLogService;
@@ -111,6 +113,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('WeighExceptedService',WeighExceptedService::class);
         app()->singleton('AllInventoryService',AllInventoryService::class);
         app()->singleton('InventoryDailyLogService',InventoryDailyLogService::class);
+        app()->singleton('LogService',LogService::class);
         app()->singleton('ProcessService',ProcessService::class);
         app()->singleton('ProcessStatisticService',ProcessStatisticService::class);
         app()->singleton('OwnerService',OwnerService::class);

app/Providers/RouteServiceProvider.php

@@ -90,9 +90,12 @@ class RouteServiceProvider extends ServiceProvider
         Route::prefix('api/thirdPart/haiq')
             ->namespace('App\Http\Controllers\api\thirdPart\haiq')
             ->group(base_path('routes/api/thirdPart/haiq.php'));
-
         Route::prefix('api/thirdPart/goodscan')
             ->namespace('App\Http\Controllers\api\thirdPart\goodscan')
             ->group(base_path('routes/api/thirdPart/goodscan.php'));
+        Route::prefix('api/thirdPart/haochuang')
+            ->middleware('api')
+            ->namespace('App\Http\Controllers\Api\thirdPart\haochuang')
+            ->group(base_path('routes/api/thirdPart/haochuang.php'));
     }
 }

app/Services/CommodityService.php

@@ -198,9 +198,9 @@ Class CommodityService
         if(count($insert_params) > 0){
             try {
                 $this->insert($insert_params);
-                LogService::log(__METHOD__,__FUNCTION__,'批量添加 commodity ' . count($insert_params) .json_encode($insert_params) );
+                app('LogService')->log(__METHOD__,__FUNCTION__,'批量添加 commodity ' . count($insert_params) .json_encode($insert_params) );
             } catch (\Exception $e) {
-                LogService::log(__METHOD__,__FUNCTION__,'批量添加 commodity error' .json_encode($insert_params) ."||".$e->getMessage().'||'.$e->getTraceAsString());
+                app('LogService')->log(__METHOD__,__FUNCTION__,'批量添加 commodity error' .json_encode($insert_params) ."||".$e->getMessage().'||'.$e->getTraceAsString());
             }
         }
         return Commodity::query()

app/Services/InventoryAccountService.php

@@ -424,7 +424,7 @@ class InventoryAccountService
         $inventoryAccountMission->difference_amount=$count;//盘点差异
         $inventoryAccountMission->checked='是';
         $inventoryAccountMission->save();
-        Controller::logS(__METHOD__,"".__FUNCTION__,json_encode($inventoryId));
+        Controller::logS(__METHOD__,"增加系统之外的盘点记录".__FUNCTION__,json_encode($inventoryAccountMission));
         if ($inventoryAccountMission){
             $inventoryAccountMission->createSignStockInventoryPersons();
             Controller::logS(__METHOD__,"增加盘点人".__FUNCTION__,json_encode($inventoryId));
@@ -551,7 +551,7 @@ class InventoryAccountService
         $inventoryAccountMission=InventoryAccountMission::query()->find($inventoryAccountMissionId);
         $inventoryAccountMission->checked='跳过';
         $inventoryAccountMission->update();
-        LogService::log(__METHOD__,"跳过盘点记录修改checked状态",json_encode($inventoryAccountMissionId));
+        app('LogService')->log(__METHOD__,"跳过盘点记录修改checked状态",json_encode($inventoryAccountMissionId));
         if ($inventoryAccountMission->checked=='跳过'){
             $inventoryAccount=InventoryAccount::query()->find($inventoryAccountId);
             $inventoryAccount->processed=$inventoryAccount->getProcessedAmount();//已盘点数
@@ -566,7 +566,7 @@ class InventoryAccountService
         $inventoryAccountMission=InventoryAccountMission::query()->find($inventoryAccountMissionId);
         $inventoryAccountMission->checked='确认差异';
         $inventoryAccountMission->update();
-        LogService::log(__METHOD__,"跳过盘点记录修改checked状态",json_encode($inventoryAccountMissionId));
+        app('LogService')->log(__METHOD__,"跳过盘点记录修改checked状态",json_encode($inventoryAccountMissionId));
         return $inventoryAccountMission;
     }
     public function 批量跳过或确认差异($checkData){
@@ -580,7 +580,7 @@ class InventoryAccountService
             $inventoryAccountMission->update();
             array_push($inventoryAccountMissions,$inventoryAccountMission);
         }
-        LogService::log(__METHOD__,"批量跳过或确认差异",json_encode($checkData));
+        app('LogService')->log(__METHOD__,"批量跳过或确认差异",json_encode($checkData));
         $inventoryAccount=InventoryAccount::query()->find($inventoryAccountId);
         $inventoryAccount->processed=$inventoryAccount->getProcessedAmount();//已盘点数
         $inventoryAccount->difference=$inventoryAccount->getDifferenceAmount();//盘点差异数
@@ -605,7 +605,7 @@ class InventoryAccountService
             'goodses'=>$goodses,
             'inventoryId'=>$inventoryId,
         ];
-        LogService::log(__METHOD__,"盘点基于盲收",json_encode($request));
+        app('LogService')->log(__METHOD__,"盘点基于盲收",json_encode($request));
         $inventoryAccountMissions=[];
         foreach ($goodses as $good){
             $barcode=$good['barcode']??'';

app/Services/OracleDocAsnDetailService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\OracleDOCASNDetail;
 
@@ -36,5 +36,4 @@ Class OracleDocAsnDetailService
         }
         return $query->get();
     }
-
-}
+}

app/Services/OracleDocAsnHerderService.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Services;
+
+use App\OracleDOCASNHeader;
+
+Class OracleDocAsnHerderService
+{
+    public function getWmsAsnOnStartDateCreate($startDate)
+    {
+        if (!$startDate) return null;
+        return OracleDOCASNHeader::query()
+            ->with(['asnType', 'asnStatus', 'asnDetails' => function ($query) {
+                $query->with(['lineStatus', 'qualityStatus','basSku']);
+            }])
+            ->select('asnno','asnstatus','asntype','addtime','edittime','customerid','notes','warehouseid','asnreference3')
+            ->where('addTime', '>=', $startDate)
+            ->get();
+    }
+
+    public function getWmsAsnOnStartDateEdit($startDate)
+    {
+        if (!$startDate) return null;
+        return OracleDOCASNHeader::query()
+            ->with(['asnType', 'asnStatus', 'asnDetails' => function ($query) {
+                $query->with(['lineStatus', 'qualityStatus','basSku']);
+            }])
+            ->select('asnno','asnstatus','asntype','addtime','edittime','customerid','notes','warehouseid','asnreference3')
+            ->where('EditTime', '>=', $startDate)
+            ->whereColumn('EditTime', '<>', 'addTime')
+            ->get();
+    }
+
+}

app/Services/OrderIssueService.php

@@ -226,52 +226,54 @@ class OrderIssueService
     public function getSqlList(array $params)
     {
         $orderPackageSql = OrderPackage::query()->selectRaw('order_packages.logistic_number order_package_logistic_number')
-            ->leftJoin('order_package_commodities', 'order_packages.id', 'order_package_commodities.order_package_id')
+            ->leftJoin('order_package_commodities','order_packages.id','order_package_commodities.order_package_id')
             ->selectRaw('order_package_commodities.amount commodity_amount')
-            ->leftJoin('commodities', 'order_package_commodities.commodity_id', 'commodities.id')
+            ->leftJoin('commodities','order_package_commodities.commodity_id','commodities.id')
             ->selectRaw('commodities.name commodity_name,commodities.sku commodity_sku')
-            ->leftJoin('order_issues', 'order_packages.order_id', 'order_issues.order_id')
+            ->leftJoin('order_issues','order_packages.order_id','order_issues.order_id')
             ->selectRaw('order_issues.id order_issue_id')
             ->sql();
-        $secondOrderPackageSql = Order::query()->from('order_packages', 's_o_p')->selectRaw('s_o_p.logistic_number')
-            ->leftJoin('order_package_commodities as s_o_p_c', 's_o_p_c.order_package_id', 's_o_p.id')
+        $secondOrderPackageSql = Order::query()->from('order_packages','s_o_p')->selectRaw('s_o_p.logistic_number')
+            ->leftJoin("orders as o_d","s_o_p.order_id","o_d.id")
+            ->leftJoin('order_package_commodities as s_o_p_c','s_o_p_c.order_package_id','s_o_p.id')
             ->selectRaw('s_o_p_c.amount s_o_p_c_amount')
-            ->leftJoin('commodities as s_c', 's_o_p_c.commodity_id', 's_c.id')
+            ->leftJoin('commodities as s_c','s_o_p_c.commodity_id','s_c.id')
             ->selectRaw('s_c.sku s_c_sku,s_c.name s_c_name')
-            ->leftJoin('order_issues', 's_o_p.order_id', 'order_issues.second_order_id')
+            ->leftJoin('order_issues','o_d.client_code','order_issues.second_client_no')
             ->selectRaw('order_issues.id order_issue_id')
             ->sql();
         $rejectedBillItemSql = RejectedBillItem::query()->selectRaw('rejected_bill_items.remark,rejected_bill_items.amount rejected_bill_amount,rejected_bill_items.name_goods,rejected_bill_items.barcode_goods')
-            ->leftJoin('order_issues', 'rejected_bill_items.id_rejected_bill', 'order_issues.rejected_bill_id')
+            ->leftJoin('rejected_bills',"rejected_bill_items.id_rejected_bill","rejected_bills.id")
+            ->leftJoin('order_issues','rejected_bills.logistic_number_return','order_issues.logistic_number_return')
             ->selectRaw('order_issues.id order_issue_id')
             ->sql();
         $logSql = OrderIssueProcessLog::query()->selectRaw('order_issue_process_logs.content log_content,order_issue_process_logs.type log_type')
-            ->leftJoin('users', 'order_issue_process_logs.user_id', 'users.id')
+            ->leftJoin('users','order_issue_process_logs.user_id','users.id')
             ->selectRaw('users.name user_name')
-            ->leftJoin('order_issues', 'order_issue_process_logs.order_issue_id', 'order_issues.id')
+            ->leftJoin('order_issues','order_issue_process_logs.order_issue_id','order_issues.id')
             ->selectRaw('order_issues.id order_issue_id')
             ->sql();
         $column = "order_issues.id,order_issues.rejected_bill_id,order_issues.rejecting_status,order_issues.created_at order_issues_created_at,order_issues.result_explain,order_issues.final_status,";
         $column .= "order_issues.logistic_indemnity_money,order_issues.logistic_express_remission,order_issues.baoshi_indemnity_money,order_issues.baoshi_express_remission";
-        $orderIssueSql = $this->getConditionQuery($params)->selectRaw($column)
-            ->leftJoin('order_issue_types', 'order_issues.order_issue_type_id', 'order_issue_types.id')
+        $orderIssueSql =  $this->getConditionQuery($params)->selectRaw($column)
+            ->leftJoin('order_issue_types','order_issues.order_issue_type_id','order_issue_types.id')
             ->selectRaw('order_issue_types.`name` order_issue_type_name')
-            ->leftJoin('orders', 'order_issues.order_id', 'orders.id')
+            ->leftJoin('orders','order_issues.order_id','orders.id')
             ->selectRaw('orders.id order_id,orders.address,orders.district,orders.city,orders.province,orders.consignee_phone,orders.consignee_name,orders.client_code,orders.created_at order_created_at')
-            ->leftJoin('logistics', 'logistics.id', 'orders.logistic_id')
+            ->leftJoin('logistics','logistics.id','orders.logistic_id')
             ->selectRaw('logistics.name logistic_name')
-            ->leftJoin('owners', 'owners.id', 'orders.owner_id')
+            ->leftJoin('owners','owners.id','orders.owner_id')
             ->selectRaw('owners.name owner_name')
-            ->leftJoin('shops', 'orders.shop_id', 'shops.id')
+            ->leftJoin('shops','orders.shop_id','shops.id')
             ->selectRaw('shops.name shop_name')
-            ->leftJoin('orders as s_o', 's_o.id', 'order_issues.second_order_id')
+            ->leftJoin('orders as s_o','s_o.client_code','order_issues.second_client_no')
             ->selectRaw('s_o.id s_o_id,s_o.client_code s_o_client_code')
-            ->leftJoin('logistics as s_logistics', 's_o.logistic_id', 's_logistics.id')
+            ->leftJoin('logistics as s_logistics','s_o.logistic_id','s_logistics.id')
             ->selectRaw('s_logistics.name s_logistics_name')
-            ->leftJoin('user_workgroups', 'user_workgroups.id', 'order_issues.user_workgroup_id')
+            ->leftJoin('user_workgroups','user_workgroups.id','order_issues.user_workgroup_id')
             ->selectRaw('user_workgroups.name user_workgroup_name')
             ->sql();
-        return compact('orderPackageSql', 'secondOrderPackageSql', 'orderIssueSql', 'rejectedBillItemSql', 'logSql');
+        return compact('orderPackageSql','secondOrderPackageSql','orderIssueSql','rejectedBillItemSql','logSql');
     }
 
     public function paginate(array $params)
@@ -317,10 +319,10 @@ class OrderIssueService
                 'type' => '创建'
             ];
             app(OrderIssueProcessLogService::class)->create($param);
-            LogService::log(__METHOD__, __FUNCTION__, '创建问题件' . count($innerParams) . json_encode($innerParams));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件' . count($innerParams) . json_encode($innerParams));
             return true;
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '创建问题件 error' . count($innerParams) . json_encode($innerParams) . $e->getMessage() . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件 error' . count($innerParams) . json_encode($innerParams) . $e->getMessage() . $e->getTraceAsString());
             return false;
         }
     }
@@ -368,9 +370,9 @@ class OrderIssueService
             $orderIssue = OrderIssue::query()->create($arr);
             $orderIssue->同步退单状态();
             $orderIssue->order = $order;
-            LogService::log(__METHOD__, __FUNCTION__, '创建问题件' . json_encode($orderIssue));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件' . json_encode($orderIssue));
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '创建问题件error' . json_encode($arr) . $e->getMessage() . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件error' . json_encode($arr) . $e->getMessage() . $e->getTraceAsString());
         } finally {
             unset($orderHeader, $rejectedBill, $order);
             return $orderIssue;
@@ -435,10 +437,10 @@ class OrderIssueService
     {
         try {
             $bool = OrderIssue::query()->whereIn('id', $ids)->delete();
-            LogService::log(__METHOD__, __FUNCTION__, json_encode($ids));
+            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($ids));
             return ['success' => $bool];
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, 'error' . json_decode($ids) . '||' . $e->getMessage() . '||' . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, 'error' . json_decode($ids) . '||' . $e->getMessage() . '||' . $e->getTraceAsString());
             return ['success' => false];
         }
     }
@@ -535,10 +537,10 @@ class OrderIssueService
         }
         try {
             OrderIssue::query()->whereIn('id', $ids)->update(['imported_status' => '导入已梳理']);
-            LogService::log(__METHOD__,__FUNCTION__,'导入处理 '.json_encode($ids).'导入处理');
+            app('LogService')->log(__METHOD__,__FUNCTION__,'导入处理 '.json_encode($ids).'导入处理');
             return ['success' => true];
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'导入处理 error'.json_encode($e->getMessage()).$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'导入处理 error'.json_encode($e->getMessage()).$e->getTraceAsString());
             return ['success' => false,'fail_info'=>$e->getMessage()];
         }
     }

app/Services/OrderPackageCommoditiesService.php

@@ -92,10 +92,10 @@ class OrderPackageCommoditiesService
         try {
             if(count($newItems) > 0 ){
                 OrderPackageCommodities::query()->insert($newItems);
-                LogService::log(__METHOD__,__FUNCTION__,'添加包裹商品信息'.json_encode($newItems));
+                app('LogService')->log(__METHOD__,__FUNCTION__,'添加包裹商品信息'.json_encode($newItems));
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'添加包裹商品信息异常'.json_encode($newItems).$e->getMessage(),$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'添加包裹商品信息异常'.json_encode($newItems).$e->getMessage(),$e->getTraceAsString());
         } finally {
             unset($newItems,$orderPackageCommodities);
         }
@@ -138,10 +138,10 @@ class OrderPackageCommoditiesService
             $count  = OrderPackageCommodities::query()->where(['order_package_id' => $orderPackage['id'], 'commodity_id' => $commodity['id'], 'amount' => $detail['qty_each']])->count();
             if($count == 0){
                 $orderPackageCommodities = OrderPackageCommodities::query()->firstOrCreate(['order_package_id' => $orderPackage['id'], 'commodity_id' => $commodity['id'], 'amount' => $detail['qty_each']]);
-                LogService::log(__METHOD__,__FUNCTION__,'创建订单包裹详情'.json_encode($orderPackageCommodities));
+                app('LogService')->log(__METHOD__,__FUNCTION__,'创建订单包裹详情'.json_encode($orderPackageCommodities));
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'创建订单包裹失败'.$e->getMessage().$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'创建订单包裹失败'.$e->getMessage().$e->getTraceAsString());
         } finally {
             return $orderPackageCommodities ?? null;
         }
@@ -185,9 +185,9 @@ class OrderPackageCommoditiesService
         if(!$params){return [];}
         try {
             $this->insert($params);
-            LogService::log(__METHOD__,__FUNCTION__,'批量创建 OrderPackageCommodities'.count($params).json_encode($params));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量创建 OrderPackageCommodities'.count($params).json_encode($params));
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'批量创建 OrderPackageCommodities error'.json_encode($params)."||".$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量创建 OrderPackageCommodities error'.json_encode($params)."||".$e->getMessage().'||'.$e->getTraceAsString());
         } finally {
             $order_package_ids = array_unique(data_get($params,'*.order_package_id'));
             unset($params);
@@ -230,9 +230,9 @@ class OrderPackageCommoditiesService
         if(count($ids) == 0){return [];}
         try {
             OrderPackageCommodities::query()->whereIn('id', $ids)->delete();
-            LogService::log(__METHOD__,__FUNCTION__,'删除多余OrderPackageCommodities '.$orderPackageCommodities->count().json_encode($orderPackageCommodities),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除多余OrderPackageCommodities '.$orderPackageCommodities->count().json_encode($orderPackageCommodities),null);
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'删除多余OrderPackageCommodities error'.$orderPackageCommodities->count().json_encode($orderPackageCommodities).$e->getMessage().$e->getTraceAsString(),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除多余OrderPackageCommodities error'.$orderPackageCommodities->count().json_encode($orderPackageCommodities).$e->getMessage().$e->getTraceAsString(),null);
             return [];
         }
         return $ids;
@@ -548,11 +548,11 @@ class OrderPackageCommoditiesService
         if($OPCs->count() == 0){return;}
         try {
             OrderPackageCommodities::query()->whereIn('id', $ids)->delete();
-            LogService::log(__METHOD__, __FUNCTION__, '删除OrderPackageCommodities ' . count($ids) . json_encode($OPCs));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '删除OrderPackageCommodities ' . count($ids) . json_encode($OPCs));
             $orderTracking = OrderTracking::query()->whereIn('order_package_commodity_id',$ids)->get();
             app(OrderTrackingService::class)->deleteOrderTracings($orderTracking);
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '删除OrderPackageCommodities ' . count($ids) . json_encode($OPCs).$e->getMessage().$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '删除OrderPackageCommodities ' . count($ids) . json_encode($OPCs).$e->getMessage().$e->getTraceAsString());
         }
     }
 

app/Services/OrderPackageService.php

@@ -44,9 +44,9 @@ class OrderPackageService
             try {
                 $orderPackage = OrderPackage::query()->firstOrCreate(['order_id' => $order['id'], 'logistic_number' => $logistic_number]);
                 $orderPackageCommoditiesService->basedOnOracleDetailsStore($orderHeader['orderno'], $orderPackage);
-                LogService::log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage' . json_encode($orderPackage));
+                app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage' . json_encode($orderPackage));
             } catch (\Exception $e) {
-                LogService::log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage失败' . $e->getMessage() . $e->getTraceAsString());
+                app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage失败' . $e->getMessage() . $e->getTraceAsString());
             }
         } else if ($oracleActAllocationDetails->count() > 0) {
             $count = $oracleActAllocationDetails->where('OrderNo', $order['code'])->whereNull('picktotraceid')->count();
@@ -59,9 +59,9 @@ class OrderPackageService
                 try {
                     $orderPackage = OrderPackage::query()->firstOrCreate(['order_id' => $order['id'], 'logistic_number' => $logistic_number]);
                     $orderPackageCommoditiesService->basedOnOracleDetailsStore($order, $orderPackage);
-                    LogService::log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage' . json_encode($orderPackage));
+                    app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage' . json_encode($orderPackage));
                 } catch (\Exception $e) {
-                    LogService::log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage失败' . $e->getMessage() . $e->getTraceAsString());
+                    app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单包裹orderPackage失败' . $e->getMessage() . $e->getTraceAsString());
                 }
             } else {
                 $ActAllocationDetails = $oracleActAllocationDetails->where('orderno', $order['code']);
@@ -82,9 +82,9 @@ class OrderPackageService
                         try {
                             $orderPackage = OrderPackage::query()->create(['order_id' => $order['id'], 'logistic_number' => $logistic_number]);
                             $orderPackageCommoditiesService->basedOnActAllocationDetailsStoreByOrderNo($order['code'], $orderPackage);
-                            LogService::log(__METHOD__, __FUNCTION__, '创建订单orderPackage' . json_encode($orderPackage));
+                            app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单orderPackage' . json_encode($orderPackage));
                         } catch (\Exception $e) {
-                            LogService::log(__METHOD__, __FUNCTION__, '创建订单orderPackage失败' . json_encode($e->getMessage()) . json_encode($e->getTraceAsString()));
+                            app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单orderPackage失败' . json_encode($e->getMessage()) . json_encode($e->getTraceAsString()));
                         }
                         continue;
                     }
@@ -96,9 +96,9 @@ class OrderPackageService
                     try {
                         $orderPackage = OrderPackage::query()->create(['order_id' => $order['id'], 'logistic_number' => $logistic_number]);
                         $orderPackageCommoditiesService->basedOnActAllocationDetailsStore($orderPackage);
-                        LogService::log(__METHOD__, __FUNCTION__, '创建订单' . json_encode($orderPackage));
+                        app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单' . json_encode($orderPackage));
                     } catch (\Exception $e) {
-                        LogService::log(__METHOD__, __FUNCTION__, '创建订单orderPackage失败' . json_encode($e->getMessage()) . json_encode($e->getTraceAsString()));
+                        app('LogService')->log(__METHOD__, __FUNCTION__, '创建订单orderPackage失败' . json_encode($e->getMessage()) . json_encode($e->getTraceAsString()));
                     }
                 }
             }
@@ -309,9 +309,9 @@ class OrderPackageService
         if(count($params) == 0)return null;
         try {
             $this->insert($params);
-            LogService::log(__METHOD__,__FUNCTION__,'批量生成 orderPackage' . count($params) . json_encode($params));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量生成 orderPackage' . count($params) . json_encode($params));
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'批量生成 orderPackage error ' . json_encode($params) . $e->getMessage() . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量生成 orderPackage error ' . json_encode($params) . $e->getMessage() . $e->getTraceAsString());
         } finally {
             $logistic_numbers = data_get($params,'*.logistic_number');
             unset($params);
@@ -335,11 +335,11 @@ class OrderPackageService
         $delete_ids = app(OrderPackageCommoditiesService::class)->删除包裹商品信息_根据快递单号($delete_logistic_number);
         try {
             OrderPackage::query()->whereIn('logistic_number', $delete_logistic_number)->delete();
-            LogService::log(__METHOD__,__FUNCTION__,'删除多余OrderPackage '.$delete_orderPackages->count().json_encode($delete_orderPackages),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除多余OrderPackage '.$delete_orderPackages->count().json_encode($delete_orderPackages),null);
             $orderTracking = OrderTracking::query()->whereIn('order_package_commodity_id', $delete_ids)->get();
             app(OrderTrackingService::class)->deleteOrderTracings($orderTracking);
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'删除多余OrderPackage error'.$delete_orderPackages->count().json_encode($delete_orderPackages).$e->getMessage().$e->getTraceAsString(),null);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除多余OrderPackage error'.$delete_orderPackages->count().json_encode($delete_orderPackages).$e->getMessage().$e->getTraceAsString(),null);
         }
     }
 

app/Services/OrderService.php

@@ -196,7 +196,7 @@ class OrderService
                     'paginate'=>$paginate,'page'=>$page]);
             $params['ordernos'] = $ordernos;
         }
-        $sql="select ACT_ALLOCATION_DETAILS.picktotraceid,ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
+        $sql="select ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,
        DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
         ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
@@ -236,9 +236,9 @@ class OrderService
                       left join BAS_CODES  order_detail_code on order_detail_code.CODE=DOC_ORDER_DETAILS.linestatus and order_detail_code.codeid='SO_STS'
                       left join BAS_Customer on BAS_Customer.customerid=DOC_ORDER_HEADER.customerid
                       left join  BAS_SKU on DOC_Order_Details.CustomerID=BAS_SKU.CustomerID and DOC_Order_Details.SKU=BAS_SKU.SKU
-                      left join ACT_ALLOCATION_DETAILS on DOC_Order_Details.orderno=ACT_ALLOCATION_DETAILS.orderno and
-                      DOC_Order_Details.orderlineno=ACT_ALLOCATION_DETAILS.orderlineno GROUP BY ACT_ALLOCATION_DETAILS.picktotraceid,
-                      ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,
+                      left join  ACT_ALLOCATION_DETAILS on DOC_Order_Details.orderno = ACT_ALLOCATION_DETAILS.orderno
+                      and DOC_Order_Details.ORDERLINENO = ACT_ALLOCATION_DETAILS.ORDERLINENO
+                      GROUP BY ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,
                       DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,
                       DOC_ORDER_HEADER.CustomerID,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
                       DOC_ORDER_HEADER.EDIREMARKS2,DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1, DOC_ORDER_HEADER.soreference5,
@@ -284,19 +284,13 @@ class OrderService
 
     private function orderFormat($orders){
         $commodities=[];
+        $orderNos = "(''";
         $picktotraceids=[];
         /*
          * 第二种扁平化方式(节省空间)： 使用快慢指针，因拿到数据正常为顺序数据,自下标1开始与上一条对比orderno唯一标识，不同则更新慢指针下标，
          *  相同则为指定下标map类型数组追加一个键值对属性来记录同类数量,如N条，每次追加属性时先看属性是否存在，存在+1
          * */
         foreach ($orders as $index=>$order){
-            if ($order->picktotraceid){
-                if (array_key_exists($order->orderno,$picktotraceids)){
-                    if (!in_array($order->picktotraceid,$picktotraceids[$order->orderno],true)){
-                        array_push($picktotraceids[$order->orderno],$order->picktotraceid);
-                    };
-                }else $picktotraceids[$order->orderno] = [$order->picktotraceid];
-            }
             if (isset($commodities[$order->orderno])){
                 array_push($commodities[$order->orderno],
                     ["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,"descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered
@@ -306,6 +300,13 @@ class OrderService
             }
             $commodities[$order->orderno]=[["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,
                 "descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered,"checktime"=>$order->checktime,"orderdetailcodename"=>$order->orderdetailcodename]];
+            $orderNos .= ",'".$order->orderno."'";
+        }
+        $orderNos .= ")";
+        $allocations = DB::connection("oracle")->select(DB::raw("SELECT DROPID,ORDERNO FROM ACT_ALLOCATION_DETAILS WHERE orderno IN ".$orderNos." GROUP BY (DROPID,ORDERNO)"));
+        foreach ($allocations as $allocation){
+            if (isset($picktotraceids[$allocation->orderno])) $picktotraceids[$allocation->orderno][] = $allocation->dropid;
+            else $picktotraceids[$allocation->orderno] = [$allocation->dropid];
         }
         $picktotraceids=json_encode($picktotraceids);
         $orders=array_values($orders);
@@ -332,9 +333,9 @@ class OrderService
             if (!$owner) {
                 try {
                     $owner = Owner::query()->create(['code' => $orderHeadAttr['customerid'], 'name' => $customer_name]);
-                    LogService::log(__METHOD__, __FUNCTION__, '创建货主' . json_encode($owner));
+                    app('LogService')->log(__METHOD__, __FUNCTION__, '创建货主' . json_encode($owner));
                 } catch (\Exception $e) {
-                    LogService::log(__METHOD__, __FUNCTION__, '创建货主失败' . $e->getMessage() . $e->getTraceAsString());
+                    app('LogService')->log(__METHOD__, __FUNCTION__, '创建货主失败' . $e->getMessage() . $e->getTraceAsString());
                 }
             }
             $owner_id = $owner['id'];
@@ -352,9 +353,9 @@ class OrderService
                 try {
                     $logistics = Logistic::query()->create(['name' => $orderHeadAttr['carriername'], 'code' => $orderHeadAttr['userdefine1']]);
                     $logistics_id = $logistics['id'];
-                    LogService::log(__METHOD__,__FUNCTION__,'创建承运商'.json_encode($logistics));
+                    app('LogService')->log(__METHOD__,__FUNCTION__,'创建承运商'.json_encode($logistics));
                 } catch (\Exception $e) {
-                    LogService::log(__METHOD__,__FUNCTION__,'创建承运商失败'.$e->getMessage().$e->getTraceAsString());
+                    app('LogService')->log(__METHOD__,__FUNCTION__,'创建承运商失败'.$e->getMessage().$e->getTraceAsString());
                 }
             }
             $warehouse = Warehouse::query()->where('code',$orderHeadAttr['warehouseid'])->first();
@@ -573,9 +574,9 @@ class OrderService
         if(count($params) == 0) return [];
         try {
             $this->insert($params);
-            LogService::log(__METHOD__,__FUNCTION__,'批量创建 order '.count($params).json_encode($params));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量创建 order '.count($params).json_encode($params));
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'批量创建 order '.json_encode($params).'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'批量创建 order '.json_encode($params).'||'.$e->getMessage().'||'.$e->getTraceAsString());
         } finally{
             return Order::query()->whereIn('code',data_get($params,'*.code'))->get();
         }

app/Services/OrderTrackingService.php

@@ -112,34 +112,34 @@ class OrderTrackingService
             ->orderBy('order_trackings.order_client_code')
             ->paginate($params['paginate'] ?? 50);
     }
-//
-//    public function getSql($params)
-//    {
-//        if($params['data'] ?? false){
-//            $params['ids'] = $params['data'];
-//        }
-//        $order_tracking_colnums = "case order_trackings.order_client_code when  order_trackings.web_order_number then '' when order_trackings.order_client_code then  order_trackings.order_client_code end order_client_code,";
-//        $order_tracking_colnums .= 'order_trackings.web_order_number,order_trackings.pick_up_at,order_trackings.sale,order_trackings.client,order_trackings.order_remark,order_trackings.gross_weight,order_trackings.bulk,';
-//        $order_tracking_colnums .= "case order_trackings.planning_sent_at when '0000-00-00 00:00:00' then null else order_trackings.planning_sent_at end planning_sent_at,";
-//        $order_tracking_colnums .= 'order_trackings.pallet_total,order_trackings.is_on_duty_shift,order_trackings.is_arrival,order_trackings.signed_at,order_trackings.receive_bill_status,order_trackings.remark';
-//        return  $this->getConditionQuery($params)
-//            ->orderBy('order_trackings.order_client_code')
-//            ->orderByDesc('order_trackings.pick_up_at')
-//            ->selectRaw($order_tracking_colnums)
-//            ->leftJoin('order_package_commodities','order_trackings.order_package_commodity_id','order_package_commodities.id')
-//                ->selectRaw('order_package_commodities.amount amount')
-//            ->leftJoin('order_packages','order_package_commodities.order_package_id','order_packages.id')
-//                ->selectRaw('order_packages.logistic_number logistic_number')
-//            ->leftJoin('orders','order_packages.order_id','orders.id')
-//                ->selectRaw('orders.city city')
-//            ->leftJoin('logistics','orders.logistic_id','logistics.id')
-//                ->selectRaw("case logistics.code when 'ZT' then '新杰物流' else  logistics.name end  logistic_name")
-//            ->leftJoin('commodities','order_package_commodities.commodity_id','commodities.id')
-//                ->selectRaw('commodities.sku sku,commodities.name sku_name')
-//            ->leftJoin('owners','orders.owner_id','owners.id')
-//               ->selectRaw('owners.name owners_name')
-//            ->sql();
-//    }
+
+    public function getSql($params)
+    {
+        if($params['data'] ?? false){
+            $params['ids'] = $params['data'];
+        }
+        $order_tracking_colnums = "case order_trackings.order_client_code when  order_trackings.web_order_number then '' when order_trackings.order_client_code then  order_trackings.order_client_code end order_client_code,";
+        $order_tracking_colnums .= 'order_trackings.web_order_number,order_trackings.pick_up_at,order_trackings.sale,order_trackings.client,order_trackings.order_remark,order_trackings.gross_weight,order_trackings.bulk,';
+        $order_tracking_colnums .= "case order_trackings.planning_sent_at when '0000-00-00 00:00:00' then null else order_trackings.planning_sent_at end planning_sent_at,";
+        $order_tracking_colnums .= 'order_trackings.pallet_total,order_trackings.is_on_duty_shift,order_trackings.is_arrival,order_trackings.signed_at,order_trackings.receive_bill_status,order_trackings.remark';
+        return  $this->getConditionQuery($params)
+            ->orderBy('order_trackings.order_client_code')
+            ->orderByDesc('order_trackings.pick_up_at')
+            ->selectRaw($order_tracking_colnums)
+            ->leftJoin('order_package_commodities','order_trackings.order_package_commodity_id','order_package_commodities.id')
+                ->selectRaw('order_package_commodities.amount amount')
+            ->leftJoin('order_packages','order_package_commodities.order_package_id','order_packages.id')
+                ->selectRaw('order_packages.logistic_number logistic_number')
+            ->leftJoin('orders','order_packages.order_id','orders.id')
+                ->selectRaw('orders.city city')
+            ->leftJoin('logistics','orders.logistic_id','logistics.id')
+                ->selectRaw("case logistics.code when 'ZT' then '新杰物流' else  logistics.name end  logistic_name")
+            ->leftJoin('commodities','order_package_commodities.commodity_id','commodities.id')
+                ->selectRaw('commodities.sku sku,commodities.name sku_name')
+            ->leftJoin('owners','orders.owner_id','owners.id')
+               ->selectRaw('owners.name owners_name')
+            ->sql();
+    }
 
     public function getOrderTrackings($params)
     {
@@ -210,7 +210,7 @@ class OrderTrackingService
             })->update($update);
             return['success'=> $bool > 0];
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'修改追踪件'.json_encode($orderId,$param,$value).$e->getMessage().$e->getTraceAsString());
+            app('LogService')->log(__METHOD__,__FUNCTION__,'修改追踪件'.json_encode($orderId,$param,$value).$e->getMessage().$e->getTraceAsString());
             return['success'=> false,'fail_info'=>$e->getMessage()];
         }
     }
@@ -293,10 +293,10 @@ class OrderTrackingService
         try {
             if (count($params) > 0) {
                 $this->insert($params);
-                LogService::log(__METHOD__, __FUNCTION__, '批量添加 orderTracking' . json_encode($params),null);
+                app('LogService')->log(__METHOD__, __FUNCTION__, '批量添加 orderTracking' . json_encode($params),null);
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '批量添加 orderTracking error' . json_encode($params).$e->getMessage().$e->getTraceAsString(),null);
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量添加 orderTracking error' . json_encode($params).$e->getMessage().$e->getTraceAsString(),null);
         }
     }
 
@@ -394,9 +394,9 @@ class OrderTrackingService
         if(count($insert_params) > 0){
             try {
                 $this->insert($insert_params);
-                LogService::log(__METHOD__,__FUNCTION__,'批量添加 OrderTracking '.count($insert_params).json_encode($insert_params));
+                app('LogService')->log(__METHOD__,__FUNCTION__,'批量添加 OrderTracking '.count($insert_params).json_encode($insert_params));
             } catch (\Exception $e) {
-                LogService::log(__METHOD__,__FUNCTION__,'批量添加 OrderTracking error'.json_encode($insert_params) .'||'.$e->getMessage(),'||'.$e->getTraceAsString());
+                app('LogService')->log(__METHOD__,__FUNCTION__,'批量添加 OrderTracking error'.json_encode($insert_params) .'||'.$e->getMessage(),'||'.$e->getTraceAsString());
             }
         }
         $this->删除订单追踪_订单取消($orderHeaders);
@@ -477,11 +477,9 @@ class OrderTrackingService
         if($orderTracking->count() == 0){return;}
         try {
             OrderTracking::query()->whereIn('id', data_get($orderTracking,'*.id'))->delete();
-            LogService::log(__METHOD__,__FUNCTION__,'删除 OrderTracking '.$orderTracking->count().json_encode($orderTracking));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除订单取消的OrderTracking '.$orderTracking->count().json_encode($orderTracking),null);
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'删除 OrderTracking error'.$orderTracking->count().json_encode($orderTracking).$e->getMessage().$e->getTraceAsString(),null);
-        } finally {
-            unset($orderTracking);
+            app('LogService')->log(__METHOD__,__FUNCTION__,'删除订单取消的OrderTracking error'.$orderTracking->count().json_encode($orderTracking).$e->getMessage().$e->getTraceAsString(),null);
         }
     }
 

app/Services/OwnerService.php

@@ -108,7 +108,7 @@ Class OwnerService
         if($owners->count() < count($customerIds)){
             $customerIds = array_diff($customerIds,data_get($owners,'*.code'));
             $owner_list = $this->createByWmsCustomerIds($customerIds);
-            $owners->concat($owner_list);
+            $owners=$owners->concat($owner_list);
         }
         return $owners;
     }
@@ -133,10 +133,10 @@ Class OwnerService
         try {
             if (count($insert_params) > 0) {
                 $this->insert($insert_params);
-                LogService::log(__METHOD__, __FUNCTION__, '批量创建 owner error' . count($insert_params) . json_encode($insert_params) );
+                app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 owner error' . count($insert_params) . json_encode($insert_params) );
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '批量创建 owner error' . json_encode($insert_params) . '||' . $e->getMessage() . '||' . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 owner error' . json_encode($insert_params) . '||' . $e->getMessage() . '||' . $e->getTraceAsString());
         } finally {
             return Owner::query()->whereIn('code', $codes)->get();
         }

app/Services/RejectedBillService.php

@@ -6,6 +6,8 @@ use App\OracleDOCOrderHeader;
 use App\OrderIssue;
 use App\RejectedBill;
 use App\Services\common\BatchUpdateService;
+use App\Services\common\DataHandlerService;
+use Carbon\Carbon;
 
 Class RejectedBillService
 {
@@ -59,7 +61,67 @@ Class RejectedBillService
              */
             $orderIssue->同步退单状态();
             $orderIssue->update(['is_new_rejecting' => '有']);
-            LogService::log(__METHOD__,__FUNCTION__,'退回单同步问题件'.json_encode($rejectedBill).json_encode($orderIssue));
+            app('LogService')->log(__METHOD__,__FUNCTION__,'退回单同步问题件'.json_encode($rejectedBill).json_encode($orderIssue));
         }
     }
+    public function syncLoadedStatusByAsnHerder($asnHerders){
+        if ($asnHerders->isEmpty())return null;
+        $updateCollect=collect();
+        foreach ($asnHerders as $asnHerder){
+            if (($asnHerder->asnType->codename_c=='退货入库'
+                    || $asnHerder->asnType->codename_c=='其他入库')
+                &&$asnHerder->asnStatus->codename_c=='完全收货'){
+                $updateCollect->add($asnHerder);
+            }
+        }
+        if ($updateCollect->isEmpty())return null;
+        $updated_at=Carbon::now()->toDateTimeString();
+        $updateParams = [[
+            'logistic_number_return','is_loaded','updated_at'
+        ]];
+        $logisticNumberReturn=[];
+        foreach ($updateCollect as $data){
+            if(!$data->asnreference3&&!$data->notes){continue;}
+            $result=[];
+            if ($data->asnreference3){
+                array_push($logisticNumberReturn,$data->asnreference3);
+            }else{
+                preg_match("/[a-zA-Z]{0,5}\d{6,20}/",$data->notes, $result);
+                array_push($logisticNumberReturn,$result[0]);
+                $result=[];
+            }
+        }
+        $rejectedBills=$this->getRejectedBills($logisticNumberReturn);
+        /** @var DataHandlerService $dataHandlerService */
+        $dataHandlerService =  app(DataHandlerService::class);
+        $rejectedBills_map =  $dataHandlerService->dataHeader(['logistic_number_return'],$rejectedBills);
+        foreach ($updateCollect as $data){
+            if(!$data->asnreference3&&!$data->notes){continue;}
+            $result=[];
+            if ($data->asnreference3){
+                $rejectedBill=$dataHandlerService->getKeyValue(['logistic_number_return'=>$data->asnreference3],$rejectedBills_map);
+                if ($rejectedBill) $updateParams[] = [
+                    'logistic_number_return'=>$data->asnreference3,
+                    'is_loaded' => 1,
+                    'updated_at' =>$updated_at,
+                ];
+            }else{
+                preg_match("/[a-zA-Z]{0,5}\d{6,20}/",$data->notes, $result);
+                $rejectedBill=$dataHandlerService->getKeyValue(['logistic_number_return'=>$result[0]],$rejectedBills_map);
+                if ($rejectedBill) $updateParams[] = [
+                    'logistic_number_return'=>$result[0],
+                    'is_loaded' => 1,
+                    'updated_at' =>$updated_at,
+                ];
+                unset($result);
+            }
+        }
+        if(count($updateParams) > 1){
+            $this->batchUpdate($updateParams);
+        }
+    }
+    public function getRejectedBills(array $logisticNumberReturn){
+        if(count($logisticNumberReturn)<1){return null;}
+        return RejectedBill::query()->whereIn('logistic_number_return',$logisticNumberReturn)->get();
+    }
 }

app/Services/RejectedService.php

@@ -126,7 +126,7 @@ class RejectedService
                 rejected_bill_items.batch_number item_batch_number,
                 rejected_bill_items.made_at item_made_at,
                 rejected_bill_items.validity_at item_validity_at,
-                rejected_bill_items.remark item_remark')
+                rejected_bill_items.remark item_remark')->whereNull("rejected_bill_items.deleted_at")
             ->leftJoin('quality_labels','rejected_bill_items.id_quality_label','=','quality_labels.id')
             ->selectRaw('quality_labels.name quality_label_name')
             ->leftJoin('users','rejected_bills.id_operator','=','users.id')

app/Services/ShopService.php

@@ -75,10 +75,10 @@ class ShopService
         try {
             if (count($insert_params) > 0) {
                 $this->insert($insert_params);
-                LogService::log(__METHOD__, __FUNCTION__, '批量创建 shop ' . count($insert_params) . json_encode($insert_params));
+                app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 shop ' . count($insert_params) . json_encode($insert_params));
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '批量创建 shop ' . json_encode($insert_params) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量创建 shop ' . json_encode($insert_params) .'||'.$e->getMessage().'||'.$e->getTraceAsString());
         } finally {
             return Shop::query()
                 ->whereIn('name',data_get($params,'*.issuepartyname'))

app/Services/StoreItemService.php

@@ -1,13 +1,222 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
+use App\Services\common\BatchUpdateService;
+use App\Services\common\DataHandlerService;
+use App\Store;
+use App\StoreItems;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
 Class StoreItemService
-{ 
+{
     public function insert(array $params){
         return DB::table('store_items')->insert($params);
     }
 
-}
+    public function storeItemCreateByWms($asnHerders)
+    {
+        if ($asnHerders->isEmpty())return null;
+        $asnDetails=collect();
+        $asnHerders->each(function ($asnHeader)use($asnDetails){
+            $asnHeader->asnDetails->each(function ($asnDetail)use($asnDetails){
+                $asnDetails->add($asnDetail);
+            });
+        });
+        $this->createStoreItem($asnDetails);
+    }
+
+    public function storeItemUpdateByWms($asnHerders)
+    {
+        if ($asnHerders->isEmpty())return null;
+        $asnDetails=collect();
+        $asnHerders->each(function ($asnHeader)use($asnDetails){
+            $asnHeader->asnDetails->each(function ($asnDetail)use($asnDetails){
+                $asnDetails->add($asnDetail);
+            });
+        });
+        $this->updateStoreItem($asnDetails);
+    }
+
+    public function createStoreItem($asnDetails)
+    {
+        if ($asnDetails->isEmpty())return null;
+        $stores = Store::query()->whereIn('asn_code',array_unique(data_get($asnDetails,'*.asnno')))->get();
+        $store_asn_code_map = [];
+        foreach ($stores as $store) {
+            $store_asn_code_map[$store->asn_code]= $store;
+        }
+        $params=$this->getParamsByAsnDetails($asnDetails,$store_asn_code_map);
+        if(count($params)> 0){
+            $this->insertStore($params);
+        }
+
+    }
+    public function getParamsByAsnDetails($asnDetails,$store_asn_code_map)
+    {
+        /** @var DataHandlerService $dataHandlerService */
+        $dataHandlerService =  app(DataHandlerService::class);
+        $storeItems=$this->getByWms($asnDetails);
+        $storeItem_map =  $dataHandlerService->dataHeader(['store_asn_code','asn_line_code','sku'],$storeItems);
+        $params = [];
+        foreach ($asnDetails as $asnDetail) {
+            $storeItem =$dataHandlerService
+                ->getKeyValue(['store_asn_code'=>$asnDetail->asnno,'asn_line_code'=>$asnDetail->asnlineno,'sku'=>$asnDetail->sku],$storeItem_map);
+            if($storeItem ?? false)continue;
+            $params[] = [
+                'store_id'=>$store_asn_code_map[$asnDetail->asnno]['id'],
+                'asn_line_code' => $asnDetail->asnlineno,
+                'name' =>$asnDetail->skudescrc,
+                'sku' =>$asnDetail->sku,
+                'barcode' =>$asnDetail->basSku?$asnDetail->basSku->alternate_sku1:'',
+                'amount' =>$asnDetail->expectedqty??0,
+                'quality' =>$asnDetail->qualityStatus?$asnDetail->qualityStatus->codename_c:'',
+                'status' => $asnDetail->lineStatus?$asnDetail->lineStatus->codename_c:'',
+                'created_at'=>$asnDetail->addtime??null,
+                'updated_at'=>$asnDetail->edittime??null,
+            ];
+        }
+        return $params;
+    }
+    public function insertStore(array $params){
+        if(count($params) === 0) return [];
+        try {
+            $this->insert($params);
+            LogService::log(__METHOD__,__FUNCTION__,'批量创建 store_item success'.count($params).json_encode($params));
+        } catch (\Exception $e) {
+            LogService::log(__METHOD__,__FUNCTION__,'批量创建 store_item error'.json_encode($params).'||'.$e->getMessage().'||'.$e->getTraceAsString());
+        } finally{
+            return StoreItems::query()->whereIn('id',data_get($params,'*.id'))->get();
+        }
+    }
+//    public function updateStoreItem($asnDetails)
+//    {
+//        if(!$asnDetails || $asnDetails->count() == 0){return null;}
+//        /** @var DataHandlerService $dataHandlerService */
+//        $dataHandlerService =  app(DataHandlerService::class);
+//        $storeItems=$this->getByWms($asnDetails);
+//        $storeItems_map =  $dataHandlerService->dataHeader(['store_asn_code','asn_line_code','sku'],$storeItems);
+//        /** @var StoreService $storeService */
+//        $storeService=app(StoreService::class);
+//        $stores=$storeService->getByWms($asnDetails);
+//        $stores_map =  $dataHandlerService->dataHeader(['asn_code'],$stores);
+//        $updateParams = [[
+//            'id','store_id','asn_line_code','name','sku','barcode','amount','quality','status','created_at','updated_at'
+//        ]];
+//        $updated_at=Carbon::now()->toDateTimeString();
+//        $delete_storeItems=[];
+//        foreach ($asnDetails as $asnDetail) {
+//            $store =$dataHandlerService->getKeyValue(['asn_code'=>$asnDetail->asnno],$stores_map);
+//            $storeItem =$dataHandlerService
+//                ->getKeyValue(['store_asn_code'=>$asnDetail->asnno,'asn_line_code'=>$asnDetail->asnlineno,'sku'=>$asnDetail->sku],$storeItems_map);
+//            if(!$storeItem){
+//                array_push($delete_storeItems,$asnDetail);
+//                continue;
+//            }
+//            if( $storeItem->store_id != $store->id ||
+//                $storeItem->asn_line_code!=$asnDetail->asnlineno ||
+//                $storeItem->name != $asnDetail->skudescrc ||
+//                $storeItem->sku != $asnDetail->sku||
+//                $storeItem->barcode !=$asnDetail->basSku->alternate_sku1||
+//                $storeItem->amount !=$asnDetail->expectedqty||
+//                $storeItem->quality !=$asnDetail->qualityStatus??$asnDetail->qualityStatus->codename_c||
+//                $storeItem->status !=$asnDetail->lineStatus??$asnDetail->lineStatus->codename_c||
+//                $storeItem->created_at !=$asnDetail->addtime||
+//                $storeItem->updated_at != $asnDetail->edittime){
+//                $updateParams[] = [
+//                    'id'=>$storeItem->id,
+//                    'store_id'=>$store->id,
+//                    'asn_line_code' => $asnDetail->asnlineno,
+//                    'name' =>$asnDetail->skudescrc,
+//                    'sku' =>$asnDetail->sku,
+//                    'barcode' =>$asnDetail->basSku?$asnDetail->basSku->alternate_sku1:'',
+//                    'amount' =>$asnDetail->expectedqty??0,
+//                    'quality' =>$asnDetail->qualityStatus?$asnDetail->qualityStatus->codename_c:'',
+//                    'status' => $asnDetail->lineStatus?$asnDetail->lineStatus->codename_c:'',
+//                    'created_at'=>$asnDetail->addtime??null,
+//                    'updated_at'=>$updated_at,
+//                ];
+//            }
+//        }
+//        if(count($updateParams) > 1){
+//            $this->batchUpdate($updateParams);
+//        }
+//
+//        if (count($asnDetails)<count($storeItems)){
+//                dd($delete_storeItems);
+//        }
+//        unset($updateParams,$asnDetails);
+//    }
+    public function updateStoreItem($asnDetails)
+    {
+        if(!$asnDetails || $asnDetails->count() == 0){return null;}
+        /** @var DataHandlerService $dataHandlerService */
+        $dataHandlerService =  app(DataHandlerService::class);
+        $storeItems=$this->getByWms($asnDetails);
+        $asnDetails_map =  $dataHandlerService->dataHeader(['asnno','asnlineno','sku'],$asnDetails);
+        $updateParams = [[
+            'id','store_id','asn_line_code','name','sku','barcode','amount','quality','status','created_at','updated_at'
+        ]];
+        $updated_at=Carbon::now()->toDateTimeString();
+        $delete_storeItems=[];
+        foreach ($storeItems as $storeItem) {
+            $asnDetail =$dataHandlerService
+                ->getKeyValue(['asnno'=>$storeItem->store_asn_code,'asnlineno'=>$storeItem->asn_line_code,'sku'=>$storeItem->sku],$asnDetails_map);
+            if(!$asnDetail){
+                array_push($delete_storeItems,$storeItem);
+                continue;
+            }
+            if($storeItem->asn_line_code!=$asnDetail['asnlineno'] ||
+                $storeItem->name != $asnDetail['skudescrc'] ||
+                $storeItem->sku != $asnDetail['sku']||
+                $storeItem->barcode !=$asnDetail['basSku']['alternate_sku1']||
+                $storeItem->amount !=$asnDetail['expectedqty']||
+                $storeItem->quality !=$asnDetail['qualityStatus']??$asnDetail['qualityStatus']['codename_c']||
+                $storeItem->status !=$asnDetail['lineStatus']??$asnDetail['lineStatus']['codename_c']||
+                $storeItem->created_at !=$asnDetail['addtime']||
+                $storeItem->updated_at != $asnDetail['edittime']){
+                $updateParams[] = [
+                    'id'=>$storeItem->id,
+                    'store_id'=>$storeItem->store->id,
+                    'asn_line_code' => $asnDetail['asnlineno'],
+                    'name' =>$asnDetail['skudescrc'],
+                    'sku' =>$asnDetail['sku'],
+                    'barcode' =>$asnDetail['basSku']?$asnDetail['basSku']['alternate_sku1']:'',
+                    'amount' =>$asnDetail['expectedqty']??0,
+                    'quality' =>$asnDetail['qualityStatus']?$asnDetail['qualityStatus']['codename_c']:'',
+                    'status' => $asnDetail['lineStatus']?$asnDetail['lineStatus']['codename_c']:'',
+                    'created_at'=>$asnDetail['addtime']??null,
+                    'updated_at'=>$updated_at,
+                ];
+            }
+        }
+        if(count($updateParams) > 1){
+            $this->batchUpdate($updateParams);
+        }
+        if (count($delete_storeItems)>0) $this->deleteStoreItem($delete_storeItems);
+        unset($updateParams,$asnDetails,$delete_storeItems);
+    }
+    public function batchUpdate($params){
+        return app(BatchUpdateService::class)->batchUpdate('store_items',$params);
+    }
+
+    public function getByWms($asnDetails){
+        if(!$asnDetails){return null;}
+        return StoreItems::query()->whereHas('store',function($query)use($asnDetails){
+            $query->whereIn('asn_code',array_unique(data_get($asnDetails,'*.asnno')));
+        })->get();
+    }
+    public function deleteStoreItem(array $delete_storeItems){
+        $storeItemIds=[];
+        foreach ($delete_storeItems as $delete_storeItem){
+            array_push($storeItemIds,$delete_storeItem->id);
+        }
+        try {
+            StoreItems::query()->whereIn('id', $storeItemIds)->delete();
+            LogService::log(__METHOD__,__FUNCTION__,'删除多余StoreItems '.count($delete_storeItems).json_encode($delete_storeItems),null);
+        } catch (\Exception $e) {
+            LogService::log(__METHOD__,__FUNCTION__,'删除多余StoreItems error'.count($delete_storeItems).json_encode($delete_storeItems).$e->getMessage().$e->getTraceAsString(),null);
+        }
+    }
+}

app/Services/StoreService.php

@@ -1,13 +1,171 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
+use App\Services\common\BatchUpdateService;
+use App\Services\common\DataHandlerService;
 use App\Store;
+use Carbon\Carbon;
+use Doctrine\DBAL\Query\QueryBuilder;
 
 Class StoreService
-{ 
-    public function create(array $params){
+{
+    public function create(array $params)
+    {
         return Store::query()->create($params);
     }
 
-}
+    public function syncWmsAsnData($startDate)
+    {
+        $this->storeCreateByWms($startDate);
+        $this->storeUpdateByWms($startDate);
+    }
+
+    public function storeCreateByWms($startDate)
+    {
+        /** @var OracleDocAsnHerderService $oracleDocAsnHerderService */
+        $oracleDocAsnHerderService = app(OracleDocAsnHerderService::class);
+        $asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateCreate($startDate);
+        $this->createStore($asnHerders);
+    }
+
+    public function storeUpdateByWms($startDate)
+    {
+        /** @var OracleDocAsnHerderService $oracleDocAsnHerderService */
+        $oracleDocAsnHerderService = app(OracleDocAsnHerderService::class);
+        $asnHerders = $oracleDocAsnHerderService->getWmsAsnOnStartDateEdit($startDate);
+        $this->updateStore($asnHerders);
+    }
+
+    public function createStore($asnHerders)
+    {
+        if ($asnHerders->isEmpty())return null;
+        /**
+         * @var OwnerService $ownerService
+         * @var WarehouseService $wareHouseService
+         */
+        $ownerService = app(OwnerService::class);
+        $owners=$ownerService->getByWmsOrders($asnHerders);
+        $wareHouseService=app(WarehouseService::class);
+        $warehouses=$wareHouseService->getByWms($asnHerders);
+        foreach ($owners as $owner) {
+            $owners_code_map[$owner->code] = $owner;
+        }
+        foreach ($warehouses as $warehouse) {
+            $warehouses_code_map[$warehouse->code] = $warehouse;
+        }
+        $params=$this->getParamsByAsnHeader($asnHerders,$owners_code_map,$warehouses_code_map);
+        if(count($params)> 0){
+            $this->insertStore($params);
+        }
+        /** @var StoreItemService $storeItemService */
+        $storeItemService = app(StoreItemService::class);
+        $storeItemService->storeItemCreateByWms($asnHerders);
+        /** @var RejectedBillService $rejectedBillService */
+        $rejectedBillService=app(RejectedBillService::class);
+        $rejectedBillService->syncLoadedStatusByAsnHerder($asnHerders);
+        $asn_nos = data_get($asnHerders,'*.asnno');
+        unset($asnHerders,$owners_code_map,$warehouses_code_map);
+        return Store::query()->whereIn('asn_code',$asn_nos)->get();
+    }
+    public function getParamsByAsnHeader($asnHerders,$owners_code_map,$warehouses_code_map)
+    {
+        $params = [];
+        $stores = Store::query()->whereIn('asn_code',data_get($asnHerders,'*.asnno'))->get();
+        $store_asn_code_map = [];
+        foreach ($stores as $store) {
+            $store_asn_code_map[$store->asn_code]= $store;
+        }
+        foreach ($asnHerders as $asnHerder) {
+            if($store_asn_code_map[$asnHerder->asnno] ?? false)continue;
+            $owner = $owners_code_map[$asnHerder->customerid] ?? null;
+            $warehouse=$warehouses_code_map[$asnHerder->warehouseid] ?? null;
+            $params[] = [
+                'asn_code' => $asnHerder->asnno,
+                'warehouse_id' =>$warehouse->id??null,
+                'owner_id' => $owner->id??null,
+                'stored_method' =>$asnHerder->asnType?$asnHerder->asnType->codename_c:'',
+                'status' =>$asnHerder->asnStatus?$asnHerder->asnStatus->codename_c:'',
+                'remark' => $asnHerder->notes??null,
+                'created_at'=>$asnHerder->addtime??null,
+                'updated_at'=>$asnHerder->edittime??null,
+            ];
+        }
+        return $params;
+    }
+    public function insertStore(array $params){
+        if(count($params) === 0) return [];
+        try {
+            $this->insert($params);
+            LogService::log(__METHOD__,__FUNCTION__,'批量创建 store success'.count($params).json_encode($params));
+        } catch (\Exception $e) {
+            LogService::log(__METHOD__,__FUNCTION__,'批量创建 store error'.json_encode($params).'||'.$e->getMessage().'||'.$e->getTraceAsString());
+        } finally{
+            return Store::query()->whereIn('asn_code',data_get($params,'*.asn_code'))->get();
+        }
+    }
+
+    public function updateStore($asnHerders)
+    {
+        if(!$asnHerders || $asnHerders->count() == 0){return null;}
+        /** @var DataHandlerService $dataHandlerService */
+        $dataHandlerService =  app(DataHandlerService::class);
+        $stores = $this->getByWms($asnHerders);
+        $store_asn_code_map =  $dataHandlerService->dataHeader(['asn_code'],$stores);
+        $owners = app(OwnerService::class)->getByWmsOrders($asnHerders);
+        $owner_code_map = $dataHandlerService->dataHeader(['code'],$owners);
+        $warehouses = app(WarehouseService::class)->getByWms($asnHerders);
+        $warehouses_map = $dataHandlerService->dataHeader(['code'],$warehouses);
+        $updateParams = [[
+            'id','asn_code','warehouse_id','owner_id','stored_method','status','remark','updated_at'
+        ]];
+        $updated_at=Carbon::now()->toDateTimeString();
+        foreach ($asnHerders as $asnHerder) {
+            $store =$dataHandlerService->getKeyValue(['asn_code'=>$asnHerder->asnno],$store_asn_code_map);
+            if(!$store){continue;}
+            $owner = $dataHandlerService->getKeyValue(['code'=>$asnHerder->customerid] ,$owner_code_map);
+            $warehouse=$dataHandlerService->getKeyValue(['code'=>$asnHerder->warehouseid],$warehouses_map);
+            $owner_id = $owner->id ?? null;
+            $warehouse_id=$warehouse->id??null;
+
+            if( $store->asn_code != $asnHerder->asnno ||
+                $store->warehouse_id!=$warehouse_id ||
+                $store->owner_id != $owner_id ||
+                $store->stored_method != $asnHerder->asnType->codename_c||
+                $store->status !=$asnHerder->asnStatus->codename_c||
+                $store->remark != $asnHerder->notes){
+                $updateParams[] = [
+                    'id'=>$store->id,
+                    'asn_code'=>$asnHerder->asnno,
+                    'warehouse_id'=>$warehouse_id,
+                    'owner_id' => $owner_id,
+                    'stored_method' =>$asnHerder->asnType?$asnHerder->asnType->codename_c:'',
+                    'status' =>$asnHerder->asnStatus?$asnHerder->asnStatus->codename_c:'',
+                    'remark' => $asnHerder->notes,
+                    'updated_at' =>$updated_at,
+                    ];
+            }
+        }
+        if(count($updateParams) > 1){
+            $this->batchUpdate($updateParams);
+        }
+        /** @var StoreItemService $storeItemService */
+        $storeItemService = app(StoreItemService::class);
+        $storeItemService->storeItemUpdateByWms($asnHerders);
+        /** @var RejectedBillService $rejectedBillService */
+        $rejectedBillService=app(RejectedBillService::class);
+        $rejectedBillService->syncLoadedStatusByAsnHerder($asnHerders);
+        unset($updateParams,$asnHerders);
+    }
+    public function insert($params){
+        return Store::query()->insert($params);
+    }
+    public function batchUpdate($params){
+        return app(BatchUpdateService::class)->batchUpdate('stores',$params);
+    }
+    public function getByWms($asnHerders){
+        if(!$asnHerders){return null;}
+        $asn_nos = array_unique(data_get($asnHerders,'*.asnno'));
+        return Store::query()->whereIn('asn_code',$asn_nos)->get();
+    }
+}

app/Services/WarehouseService.php

@@ -3,13 +3,17 @@
 namespace App\Services;
 
 use App\OracleBasCustomer;
+use App\Owner;
 use App\Warehouse;
 use Illuminate\Support\Collection;
+use Carbon\Carbon;
 
 Class WarehouseService
 {
-    public function firstOrCreate(array $params, array $values = null){
-        if ($values)return Warehouse::query()->firstOrCreate($params,$values);
+
+    public function firstOrCreate(array $params, array $values = null)
+    {
+        if ($values) return Warehouse::query()->firstOrCreate($params, $values);
         return Warehouse::query()->firstOrCreate($params);
     }
 
@@ -49,4 +53,45 @@ Class WarehouseService
         }
         return  $collet;
     }
+    public function getByWms($asnHerders)
+    {
+        $warehouseids = array_unique(data_get($asnHerders, '*.warehouseid'));
+        $warehouseids = array_diff($warehouseids, [null, '', '*']);
+        $warehouses = Warehouse::query()->whereIn('code', $warehouseids)->get();
+        if ($warehouses->count() < count($warehouseids)) {
+            $warehouseids = array_diff($warehouseids, data_get($warehouses, '*.code'));
+            $warehouse_list = $this->createWarehouseByWms($warehouseids);
+            $warehouses=$warehouses->concat($warehouse_list);
+        }
+        return $warehouses;
+    }
+
+    public function createWarehouseByWms($codes)
+    {
+        if(!$codes) {return [];}
+        $insert_params = [];
+        $created_at = Carbon::now()->format('Y-m-d H:i:s');
+        foreach ($codes as $item) {
+            $insert_params[] = [
+                'code' => $item,
+                'name' => $item,
+                'created_at' => $created_at,
+            ];
+        }
+
+        try {
+            if (count($insert_params) > 0) {
+                $this->insert($insert_params);
+                LogService::log(__METHOD__, __FUNCTION__, '批量创建 warehouse success' . count($insert_params) . json_encode($insert_params) );
+            }
+        } catch (\Exception $e) {
+            LogService::log(__METHOD__, __FUNCTION__, '批量创建 warehouse error' . json_encode($insert_params) . '||' . $e->getMessage() . '||' . $e->getTraceAsString());
+        } finally {
+            return Warehouse::query()->whereIn('code', $codes)->get();
+        }
+    }
+    public function insert($fillables){
+        return Warehouse::query()->insert($fillables);
+    }
+
 }

app/Services/common/BatchUpdateService.php

@@ -60,10 +60,10 @@ class BatchUpdateService
         try {
             // DB::update
             $bool = DB::connection($connection)->update($updateSql, $bindings);
-            LogService::log(__METHOD__, __FUNCTION__, '批量更新' . count($multipleData) . $tableName . $updateSql . json_encode($bindings));
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量更新' . count($multipleData) . $tableName . $updateSql . json_encode($bindings));
             return $bool;
         } catch (\Exception $e) {
-            LogService::log(__METHOD__, __FUNCTION__, '批量更新失败' . count($multipleData) . $tableName . $updateSql . json_encode($bindings) . $e->getMessage() . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量更新失败' . count($multipleData) . $tableName . $updateSql . json_encode($bindings) . $e->getMessage() . $e->getTraceAsString());
             return false;
         }
     }
@@ -78,10 +78,10 @@ class BatchUpdateService
         $sql .= " END WHERE ".$column." IN (".implode(',',array_keys($params)).")";
         try {
             $bool = DB::connection($connection)->update($sql);
-            LogService::log(__METHOD__, __FUNCTION__, '批量更新本身' .$sql);
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量更新本身' .$sql);
             return $bool;
         }catch (\Exception $e){
-            LogService::log(__METHOD__, __FUNCTION__, '批量更新失败 SQL:(' . $sql .") 堆栈:". $e->getMessage() . $e->getTraceAsString());
+            app('LogService')->log(__METHOD__, __FUNCTION__, '批量更新失败 SQL:(' . $sql .") 堆栈:". $e->getMessage() . $e->getTraceAsString());
             return false;
         }
     }

app/SortingStation.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App;
+
+use App\Http\Controllers\Controller;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+use mysql_xdevapi\Exception;
+use Zttp\Zttp;
+
+class SortingStation extends Model
+{
+    protected $fillable = [
+        'name','type', 'bin_amount','is_occupied','is_online','processing_batch_id','login_at'
+    ];
+    static public function findOrCreate($name){
+        $station=SortingStation::where('name',$name)->first();
+        if(!$station){
+            $station=new SortingStation(['name'=>$name]);
+            $station->save();
+        }
+        return $station;
+    }
+    public function login(){
+        $this['login_at'] = Carbon::now();
+        $this['is_online'] = '是';
+        $this->update();
+    }
+    public function setProcessingBatch(Batch $batch){
+        $this['processing_batch_id'] = $batch['id'];
+        $this['is_occupied'] = '是';
+        $this->login();
+        $this->update();
+    }
+    public function clearProcessingBatch(){
+        $this['processing_batch_id'] = null;
+        $this['is_occupied'] = '否';
+        $this->login();
+        $this->update();
+    }
+}

app/StoreItems.php

@@ -33,5 +33,4 @@ class StoreItems extends Model
     {
         return $this['depository']?$this['depository']['name']:null;
     }
-
 }

config/api.php

@@ -12,12 +12,12 @@ return [
     'sign_key_rejected_send_jianshang' => 'ymgYuN01D3UCZneZ53wGC0suOIUPmLgY',
 
 
-    /** Flux
-    https://was.baoshi56.com/api/thirdPart/flux/receive/new  //新增收货
-    https://was.baoshi56.com/api/thirdPart/flux/package/new  //新增包裹
-    https://was.baoshi56.com/api/thirdPart/flux/waybill/new  //新增运单
-     **/
     'flux'=>[
+        /** Flux
+        https://was.baoshi56.com/api/thirdPart/flux/receive/new  //新增收货
+        https://was.baoshi56.com/api/thirdPart/flux/package/new  //新增包裹
+        https://was.baoshi56.com/api/thirdPart/flux/waybill/new  //新增运单
+         **/
         'receive'=>[
             'new'=>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/RECECF?messageId=RECECF' //通知WMS, 已完成的订单收货
         ],
@@ -27,6 +27,14 @@ return [
         'waybill'=>[
             'new'=>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/?messageId=BS_TMS' //通知WMS, 已称完的包裹
         ],
+        /**分拔墙
+        https://wcs.baoshi56.com/api/thirdPart/flux/sorting/newBatch  //下发波次
+        https://wcs.baoshi56.com/api/thirdPart/flux/sorting/newCanceledOrder  //下发取消订单
+         **/
+        'inform'=>[
+            'binAssignment' => 'http://106.14.155.246:19192/datahub/FluxBSJsonApi/PUTTOLOCATION', //发送隔口号（播种位）给WMS
+            'batchFinished' => 'http://106.14.155.246:19192/datahub/FluxBSJsonApi/PUTTOLIGHT', //分播结束后通知WMS结果
+        ],
     ],
 
     'haiq'=>[
@@ -43,4 +51,13 @@ return [
         ],
     ],
 
+    /** goodScan
+    https://was.baoshi56.com/api/thirdPart/goodscan/weight/new  //新增包裹
+     */
+
+    /**浩创请求地址
+    https://wcs.baoshi56.com/api/thirdPart/haochuang/sorting/login
+    https://wcs.baoshi56.com/api/thirdPart/haochuang/sorting/process
+    https://wcs.baoshi56.com/api/thirdPart/haochuang/sorting/done
+     **/
 ];

config/sync.php

@@ -4,4 +4,8 @@ return [
         'interval' => 1,   // 时间以分为单位
         'start_at'=> '',    // 开始同步WMS的时间  时间格式： yyyy-MM-dd HH:mm:ss 如 2020-09-05 13:15:16
     ],
+    'asn_sync' => [
+        'interval' => 1,   // 时间以分为单位
+        'start_at'=> '',    // 开始同步WMS的时间  时间格式： yyyy-MM-dd HH:mm:ss 如 2020-09-05 13:15:16
+    ],
 ];

database/factories/BatchFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\Batch;
+use Faker\Generator as Faker;
+
+$factory->define(Batch::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/factories/OrderBinFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OrderBin;
+use Faker\Generator as Faker;
+
+$factory->define(OrderBin::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/factories/OrderCommodityFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OrderCommodity;
+use Faker\Generator as Faker;
+
+$factory->define(OrderCommodity::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});