Merge branch 'zzd'

app/Console/Commands/CreateOwnerReport.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\OwnerAreaReport;
+use App\OwnerBillReport;
+use App\OwnerReport;
+use App\Services\common\BatchUpdateService;
+use App\Services\LogService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class CreateOwnerReport extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'createOwnerReport';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'create owner report';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * TODO 1号生成或修改上月报表  此处假设每月生成报表数 不足1000，超过此数可能在SQL执行上溢出
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        //转化日期格式 取得上月日期与天数 & 两月前月份
+        $year = (int)date('Y');
+        $month = (int)date('m');
+        if ($month == 1){
+            $year--;
+            $lastMonth = '12';
+        }else $lastMonth = ($month-1) < 10 ? "0".($month-1) : ($month-1);
+        $historyYear = $year;
+        if (($month-1) == 1){
+            $historyYear--;
+            $historyMonth = '12';
+        }else $historyMonth = ($month-2) < 10 ? "0".($month-2) : ($month-2);
+        $lastDay = date("d",strtotime("$year-$lastMonth +1 month -1 day"));
+
+        //获取上月面积与报表
+        $areas = OwnerAreaReport::query()->with(['owner'=>function($query){
+            $query->select('id',"code");
+        }])->where("counting_month","like",$year."-".$lastMonth."%")->get();
+        $reports = OwnerReport::query()->where("counting_month","like",$year."-".$lastMonth."%")->orWhere("counting_month","like",$historyYear."-".$historyMonth."%")->get();
+        $bills = OwnerBillReport::query()->where("counting_month","like",$year."-".$lastMonth."%")->get();
+
+        //日均单量统计
+        $query = DB::raw("select  count(*) c,CUSTOMERID from DOC_ORDER_HEADER where EDITTIME >= to_date('$year-$lastMonth-01 00:00:00','yyyy-mm-dd hh24:mi:ss') and EDITTIME <= to_date('$year-$lastMonth-$lastDay 23:59:59','yyyy-mm-dd hh24:mi:ss') group by CUSTOMERID");
+        $orderStatistic = DB::connection("oracle")->select($query);
+        $map = [];
+        foreach ($orderStatistic as $item){
+            $map[$item->customerid] = round($item->c / $lastDay,2);
+        }
+
+        //已存在的报表记录
+        $reportMap = [];
+        $historyReportMap = [];
+        foreach ($reports as $report){
+            if ($report->counting_month == ($historyYear."-".$historyMonth)){
+                $historyReportMap[$report->owner_id."_".$report->counting_month] = $report->current_month_counting_area;
+                continue;
+            }
+            $reportMap[$report->owner_id."_".$report->counting_month] = $report->id;
+        }
+
+        //组装账单记录
+        $billMap = [];
+        foreach ($bills as $index => $bill){
+            $bill[$bill->owner_id."_".$bill->counting_month] = $index;
+        }
+
+        //组装报表记录数据
+        $updateReports = [[
+            "id","daily_average_order_amount","current_month_counting_area","owner_bill_report_id"
+        ]];
+        $createReports = [];
+        foreach ($areas as $area){
+            if ($reportMap[$area->owner_id."_".$area->counting_month] ?? false){
+                $updateReports[] = [
+                    "id"=>$reportMap[$area->owner_id."_".$area->counting_month],
+                    "daily_average_order_amount"=>$area->owner ? ($map[$area->owner->code] ?? 0) : 0,
+                    "current_month_counting_area"=>$area->accounting_area ?? 0,
+                    "owner_bill_report_id" => $billMap[$area->owner_id."_".$area->counting_month] ?? 0,
+                ];
+            }else $createReports[] = [
+                "owner_id"=>$area->owner_id,
+                "counting_month"=>$area->counting_month."-01",
+                "daily_average_order_amount"=>$area->owner ? ($map[$area->owner->code] ?? 0) : 0,
+                "current_month_counting_area"=>$area->accounting_area ?? 0,
+                "owner_bill_report_id" => $billMap[$area->owner_id."_".$area->counting_month] ?? 0,
+                "last_month_counting_area" => $historyReportMap[$area->owner_id."_".($historyYear."-".$historyMonth)] ?? 0,
+            ];
+        }
+        //执行生成或修改
+        LogService::log(__METHOD__,"生成货主报表",json_encode($createReports));
+        LogService::log(__METHOD__,"修改货主报表",json_encode($updateReports));
+        app(BatchUpdateService::class)->batchUpdate('owner_reports', $updateReports);
+        DB::table("owner_reports")->insert($createReports);
+    }
+}

app/Customer.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Customer extends Model
+{
+    protected $fillable = [
+        "code",         //客户代码
+        "name",         //客户名称
+        "company_name"  //公司名称
+    ];
+}

app/Feature.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Feature extends Model
+{
+    protected $fillable = [
+        "type",     //类型
+        "logic",    //逻辑
+        "describe", //特征
+    ];
+}

app/Http/Controllers/CustomerController.php

@@ -2,26 +2,87 @@
 
 namespace App\Http\Controllers;
 
+use App\Services\OwnerReportService;
+use App\Services\OwnerService;
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Http;
 
 class CustomerController extends Controller
 {
     /**
      * Display a listing of the resource.
-     *
+     * @param Request $request
      * @return Response
      */
-    public function projectReport()
+    public function projectReport(Request $request)
     {
-        if(!Gate::allows('客户管理-项目-报表')){ return redirect('denied');  }
-        return response()->view('customer.project.report');
+        if(!Gate::allows('客户管理-项目-报表')){ return view('customer.index');  }
+        $withs = ["ownerBillReport","owner"=>function($query){
+            /** @var Builder $query */
+            $query->select("id","name","deleted_at","created_at","customer_id","user_owner_group_id")
+                ->with(["customer","userOwnerGroup"]);
+        }];
+        $ownerGroups = app('UserOwnerGroupService')->getSelection();
+        $customers = app('CustomerService')->getSelection();
+        $owners = app('OwnerService')->getSelection();
+        $reports = app("OwnerReportService")->paginate($request->input(),$withs);
+        return response()->view('customer.project.report',compact("reports","ownerGroups","customers","owners"));
+    }
+
+    public function projectReportExport(Request $request)
+    {
+        if(!Gate::allows('客户管理-项目-报表')){ return '没有权限';  }
+        /** @var OwnerReportService $service */
+        $service = app('OwnerReportService');
+        $withs = ["ownerBillReport","owner"=>function($query){
+            /** @var Builder $query */
+            $query->select("id","name","deleted_at","created_at","customer_id","user_owner_group_id")
+                ->with(["customer","userOwnerGroup"]);
+        }];
+        if ($request->checkAllSign ?? false){
+            $params = $request->input();
+            unset($params['checkAllSign']);
+            $reports = $service->get($params,$withs);
+        }else $reports = $service->get(["id"=>$request->data ?? ''],$withs);
+        $column = ["项目小组","客户","子项目","状态","创建日期","在库时长","结算月","日均单量","结算月上月盘点面积","结算月盘点面积","初始账单金额","确认账单金额","确认日期"];
+        $list = [];
+        foreach ($reports as $report){
+            $list[] = [
+                $report->owner ? ($report->owner->userOwnerGroup ? $report->owner->userOwnerGroup->name : '') : '',
+                $report->owner ? ($report->owner->customer ? $report->owner->customer->name : '') : '',
+                $report->owner ? $report->owner->name : '',
+                $report->owner ? ($report->owner->deleted_at ? "冻结" : "激活") : '',
+                $report->owner ? (string)$report->owner->created_at : '',
+                $report->owner ? ($report->owner->created_at ? ((new \DateTime())->diff(new \DateTime($report->owner->created_at))->days)." 天"  : '') : '',
+                $report->counting_month,
+                $report->daily_average_order_amount,
+                $report->last_month_counting_area,
+                $report->current_month_counting_area,
+                $report->ownerBillReport ? $report->ownerBillReport->initial_fee : '',
+                $report->ownerBillReport ? $report->ownerBillReport->confirm_fee : '',
+                $report->ownerBillReport ? (string)$report->ownerBillReport->updated_at : '',
+            ];
+        }
+        $post = Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(["row"=>$column,"list"=>$list],JSON_UNESCAPED_UNICODE)]);
+        if ($post->status() == 500){
+            throw new Exception($post->header("Msg"));
+        }
+        return response($post,200, [
+            "Content-type"=>"application/octet-stream",
+            "Content-Disposition"=>"attachment; filename=客户项目报表-".date('ymdHis').'.xlsx',
+        ]);
     }
 
     public function projectIndex()
     {
         if(!Gate::allows('客户管理-项目-查询')){ return redirect('denied');  }
+        /** @var OwnerService $service */
+        $service = app('OwnerService');
+        $customers = $service->get(['customer_id'=>true],['customer']);
         return response()->view('customer.project.index');
     }
 

app/Http/Controllers/PackageController.php

@@ -22,7 +22,7 @@ class PackageController extends Controller
 
     public function __construct()
     {
-        app()->singleton('packageService',PackageService::class);
+        app()->singleton('PackageService',PackageService::class);
     }
 
     public function index(Request $request,OwnerService $ownerService)
@@ -30,7 +30,7 @@ class PackageController extends Controller
         if(!Gate::allows('称重管理-查询')){ return redirect(url('/'));  }
         $paginateParams = $request->input();
         /** @var PackageService $application */
-        $application = app('packageService');
+        $application = app('PackageService');
         $packages = $application->paginate($request);
         return view('weight.package.index',['packages'=>$packages,'owners'=>$ownerService->getSelection(),'paginateParams'=>$paginateParams]);
     }
@@ -172,9 +172,9 @@ class PackageController extends Controller
         if ($request->checkAllSign ?? false){
             $params = $request->input();
             unset($params['checkAllSign']);
-            $sql = app('packageService')->getSql($params);
+            $sql = app('PackageService')->getSql($params);
         }else{
-            $sql=app('packageService')->getSql(['id'=>$request->data]);
+            $sql=app('PackageService')->getSql(['id'=>$request->data]);
         }
         $row = ["货主","快递单号","波次号","订单号","物流公司","设备","重(KG)","长(cm)","宽(cm)","高(cm)","体积(cm³)","纸箱","状态","波次规则","称重时间","收件人","收件人电话"];
         $column = ["owner_name", "logistic_number", "batch_number", "order_code", "logistic_name","measuring_machine_name",

app/Http/Controllers/PriceModelController.php

@@ -48,4 +48,15 @@ class PriceModelController extends Controller
         if(!Gate::allows('计费模型-物流-录入')){ return redirect('denied');  }
         return response()->view('maintenance.priceModel.logistic.create');
     }
+
+    public function directLogisticIndex(){
+        if(!Gate::allows('计费模型-直发-查询')){ return redirect('denied');  }
+        return response()->view('maintenance.priceModel.directLogistic.index');
+    }
+
+    public function directLogisticCreate(){
+        if(!Gate::allows('计费模型-直发-录入')){ return redirect('denied');  }
+        return response()->view('maintenance.priceModel.directLogistic.create');
+    }
+
 }

app/Http/Controllers/ProcessStatisticController.php

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

app/Http/Controllers/TestController.php

@@ -88,35 +88,10 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method], $request);
     }
-    /*dd('IN_Warehouse：'.$doc_asn_detail->warehouseid,
-                     'In_ASNNo_C：'.$doc_asn_detail->docno,
-                     'In_ASNLineNo_C：'.$doc_asn_detail->asnlineno,
-                     'In_New_TraceID_C：'.$doc_asn_detail->new_traceid,
-                     'In_CustomerID：'.$doc_asn_detail->customerid,
-                     'In_SKU：'.$doc_asn_detail->sku,
-                     'In_ReceivedQty：'.$doc_asn_detail->receivedqty_each,
-                     'In_PackID：'.$doc_asn_detail->packid,
-                     'In_LotAtt01_C：'.$doc_asn_detail->lotatt01,
-                     'In_LotAtt02_C：'.$doc_asn_detail->lotatt02,
-                     'In_LotAtt04_C：'.$doc_asn_detail->lotatt04,
-                     'In_LotAtt05_C：'.$doc_asn_detail->lotatt05,
-                     'In_LotAtt08_C：'.$doc_asn_detail->lotatt08,
-                     'In_UserDefine1：'.$doc_asn_detail->userdefine1,
-                     'In_UserDefine2：'.$doc_asn_detail->userdefine2,
-                     'In_UserDefine3：'.$doc_asn_detail->userdefine3,
-                     'In_UserDefine4：'.$doc_asn_detail->userdefine4,
-                     'In_UserDefine5：'.$doc_asn_detail->userdefine5,
-                     'In_FMLocation：'.$doc_asn_detail->warehouseid,
-                     'In_TOLocation_C：'.$doc_asn_detail->warehouseid,
-                     'In_Operator：'.$doc_asn_detail->addwho,
-                     'In_UserID：'.$doc_asn_detail->addwho,
-                     'OUT_Return_Code：'.$result
-                 );*/
+
     public function test4(){
-        $owner_name = "BAOSHI";
-        $owner = app('ownerService')->first(["code"=>$owner_name,"name"=>$owner_name],["name"=>"or"]);
-        if (!$owner) $owner = app('ownerService')->create(["name"=>$owner_name, "code"=>$owner_name]);
-        dd($owner);
+        dd(Unit::query()->whereIn('name',[])->get());
+
     }
 
     public function test2(){

app/Imports/StoreCheckingReceiveImport.php

@@ -111,8 +111,8 @@ class StoreCheckingReceiveImport implements ToCollection,WithHeadingRow
             Cache::put("storeCheckingReceive",["success"=>false, "data"=>"货主为空，不允许录入，至少为一行标明货主！"],86400);
             return false;
         }
-        $owner = app('ownerService')->first(["code"=>$owner_name,"name"=>$owner_name],["name"=>"or"]);
-        if (!$owner) $owner = app('ownerService')->create(["name"=>$owner_name, "code"=>$owner_name]);
+        $owner = app('OwnerService')->first(["code"=>$owner_name,"name"=>$owner_name],["name"=>"or"]);
+        if (!$owner) $owner = app('OwnerService')->create(["name"=>$owner_name, "code"=>$owner_name]);
 
         //使用条码同步
         $commodityController = new CommodityController();

app/Owner.php

@@ -14,7 +14,22 @@ use App\Traits\ModelTimeFormat;
 class Owner extends Model
 {
     use ModelTimeFormat;
-    public $fillable = ['name','code','checking_count','deleted_at'];
+    public $fillable = [
+        'name',                 //名称
+        'code',                 //代码
+        'checking_count',       //审核数量
+        'deleted_at',           //删除时间
+        "customer_id",          //客户ID
+        "tax_rate",             //税率
+        "contract_number",      //合同号
+        "salesman",             //销售名称
+        "linkman",              //联系人
+        "phone_number",         //联系电话
+        "user_owner_group_id",  //项目组ID
+        "waring_line_on",       //月单量预警
+        "description"           //描述
+    ];
+
     public static function filterAuthorities(){
         $user=Auth::user();
         $query = (new static)->newQuery();
@@ -47,4 +62,12 @@ class Owner extends Model
     public function order(){
         return $this->hasOne(Order::class,'owner_id','id');
     }
+    public function customer()
+    {   //客户
+        return $this->hasOne(Customer::class,"id","customer_id");
+    }
+    public function userOwnerGroup()
+    {   //项目组
+        return $this->hasOne(UserOwnerGroup::class,"id","user_owner_group_id");
+    }
 }

app/OwnerAreaReport.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerAreaReport extends Model
+{
+    protected $fillable = [
+        "owner_id",         //货主ID
+        "counting_month",   //结算月
+        "area_on_tray",     //货物整托
+        "area_on_half_tray",//货物半托
+        "area_on_flat",     //平面区面积
+        "accounting_area",  //结算面积
+        "status"            //状态
+    ];
+
+    public function owner()
+    {   //货主
+        return $this->hasOne(Owner::class,"id","owner_id");
+    }
+
+    /* 结算月格式转换，仅截取至月
+     * 引用：CreateOwnerReport
+     */
+    public function getCountingMonthAttribute($value)
+    {
+        return substr($value,0,7);
+    }
+}

app/OwnerBillReport.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerBillReport extends Model
+{
+   protected $fillable = [
+       "owner_id",       //项目ID
+       "counting_month", //结算月
+       "initial_fee",    //原始账单金额
+       "confirm_fee",    //确认账单金额
+       "difference",     //差额
+       "confirmed",      //确认状态
+   ];
+
+   public function owner()
+   {   //货主
+       $this->hasOne(Owner::class,"id","owner_id");
+   }
+
+    /* 结算月格式转换，仅截取至月
+     * 引用：CreateOwnerReport
+     */
+    public function getCountingMonthAttribute($value)
+    {
+        return substr($value,0,7);
+    }
+}

app/OwnerFeeDetail.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App;
+
+use App\Services\ProcessMethodService;
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerFeeDetail extends Model
+{
+    protected $fillable = [
+        "owner_id",         //货主ID
+        "counting_month",   //结算月
+        "worked_at",        //作业时间
+        "type",             //类型
+        "shop_id",          //店铺ID
+        "operation_bill",   //发/收/退/提货单号
+        "consignee_name",   //收件人
+        "consignee_phone",  //收件人电话
+        "commodity_amount", //商品数量
+        "logistic_bill",    //快递单号
+        "volume",           //体积
+        "weight",           //重量
+        "logistic_id",      //物流ID
+        "process_method_id",//加工类型ID
+        "work_fee",         //作业费
+        "logistic_fee",     //物流费
+        "created_at",       //创建时间
+    ];
+    public $timestamps = false;
+
+    public function owner()
+    {   //货主
+        return $this->hasOne(Owner::class,"id","owner_id");
+    }
+    public function shop()
+    {   //店铺
+        return $this->hasOne(Shop::class,"id","shop_id");
+    }
+    public function logistic()
+    {   //物流
+        return $this->hasOne(Logistic::class,"id","logistic_id");
+    }
+    public function processMethod()
+    {   //作业类型
+        return $this->hasOne(ProcessMethod::class,"id","process_method_id");
+    }
+}

app/OwnerInStorageRule.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerInStorageRule extends Model
+{
+    protected $fillable = [
+        "owner_price_operation_id", //作业计费ID
+        "amount",                   //计量
+        "unit_id",                  //单位ID
+        "unit_price",               //单价
+    ];
+
+    public function unit()
+    {   //单位
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
+}

app/OwnerOutStorageRule.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerOutStorageRule extends Model
+{
+    protected $fillable = [
+        "owner_price_operation_id",         //作业计费ID
+        "owner_price_operation_strategy",   //作业计费策略
+        "strategy",                         //出库策略
+        "amount",                           //起步数
+        "unit_id",                          //单位ID
+        "unit_price",                       //单价
+        "feature",                          //特征
+    ];
+
+    public function unit()
+    {   //单位
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
+}

app/OwnerPriceDirectLogistic.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceDirectLogistic extends Model
+{
+    protected $fillable = [
+        "name",     //名称
+        "base_km"   //起步公里数
+    ];
+
+    public function ownerPriceDirectLogisticCars()
+    {   //直发车计费对应车型费
+        return $this->hasMany(OwnerPriceDirectLogisticCar::class,"owner_price_direct_logistic_id","id");
+    }
+}

app/OwnerPriceDirectLogisticCar.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceDirectLogisticCar extends Model
+{
+    protected $fillable = [
+        "owner_price_direct_logistic_id",   //直发车计费ID
+        "car_type_id",                      //车型ID
+        "base_fee",                         //起步费
+        "additional_fee",                   //续费(元/KM)
+    ];
+
+    public function carType()
+    {   //车型
+        return $this->hasOne(CarType::class,"id","car_type_id");
+    }
+}

app/OwnerPriceExpress.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceExpress extends Model
+{
+    protected $fillable = [
+        "name",                     //名称
+        "initial_weight_unit_id",   //首重单位
+        "additional_weight_unit_id",//续重单位
+    ];
+
+    public function owners()
+    {   //货主
+        $this->belongsToMany(Owner::class,"owner_price_express_owner","owner_price_express_id","owner_id");
+    }
+    public function logistics()
+    {   //物流
+        $this->belongsToMany(Logistic::class,"owner_price_express_logistic","owner_price_express_id","logistic_id");
+    }
+}

app/OwnerPriceExpressProvince.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceExpressProvince extends Model
+{
+    protected $fillable = [
+        "owner_price_express_id",   //快递价格ID
+        "province_id",              //省份ID
+        "initial_weight_price",     //初始单价
+        "additional_weight_price",  //续重单价
+    ];
+
+    public function ownerPriceExpress()
+    {   //快递计费
+        $this->belongsTo(OwnerPriceExpress::class,"owner_price_express_id","id");
+    }
+    public function province()
+    {   //省份
+        $this->hasOne(Province::class,"id","province_id");
+    }
+}

app/OwnerPriceLogistic.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceLogistic extends Model
+{
+    protected $fillable = [
+        "name",             //名称
+        "unit_range",       //单价一区间
+        "unit_id",          //单位一ID
+        "other_unit_range", //单位二区间
+        "other_unit_id",    //单位二ID
+        "pick_up_price",    //提货费
+        "fuel_price",       //燃油附加费
+        "service_price",    //信息服务费
+    ];
+
+    public function unit()
+    {   //单位一
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
+    public function otherUnit()
+    {   //单位二
+        return $this->hasOne(Unit::class,"id","other_unit_id");
+    }
+    public function owners()
+    {   //货主
+        return $this->belongsToMany(Owner::class,"owner_price_logistic_owner","owner_price_logistic_id","owner_id");
+    }
+    public function logistics()
+    {   //物流
+        return $this->belongsToMany(Logistic::class,"owner_price_logistic_logistic","owner_price_logistic_id","logistic_id");
+    }
+}

app/OwnerPriceLogisticDetail.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceLogisticDetail extends Model
+{
+    protected $fillable = [
+        "owner_price_logistic_id",  //物流计费
+        "unit_id",                  //单位ID
+        "range",                    //区间
+        "province_id",              //省份ID
+        "city_id",                  //城市ID
+        "unit_price",               //单价
+        "delivery_fee",             //送货费
+        "initial_fee",              //起始计费
+        "initial_amount",           //起始计数
+        "rate",                     //费率
+    ];
+
+    public function unit()
+    { //单位
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
+    public function province()
+    { //省份
+        return $this->hasOne(Province::class,"id","province_id");
+    }
+    public function city()
+    { //城市
+        return $this->hasOne(City::class,"id","city_id");
+    }
+}

app/OwnerPriceOperation.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerPriceOperation extends Model
+{
+    protected $fillable = [
+        "operation_type",   //操作类型
+        "name",             //名称
+        "strategy",         //策略
+        "feature",          //特征
+        "remark",           //备注
+    ];
+
+    public function ownerInStorageRule()
+    {   //入库规则
+        return $this->hasOne(OwnerInStorageRule::class,"owner_price_operation_id","id");
+    }
+    public function ownerOutStorageRules()
+    {   //出库规则
+        return $this->hasMany(OwnerOutStorageRule::class,"owner_price_operation_id","id");
+    }
+}

app/OwnerReport.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App;
+
+use App\Traits\ModelTimeFormat;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerReport extends Model
+{
+    use ModelTimeFormat;
+    protected $fillable = [
+        "owner_id",                     //货主ID
+        "counting_month",               //结算月
+        "daily_average_order_amount",   //日均单量
+        "current_month_counting_area",  //结算月盘点面积
+        "last_month_counting_area",     //结算月上月盘点面积
+        "owner_bill_report_id"          //账单ID
+    ];
+    public $timestamps = false;
+
+    public function owner()
+    {   //货主
+        return $this->hasOne(Owner::class,"id","owner_id");
+    }
+    public function ownerBillReport()
+    {   //账单
+        return $this->hasOne(OwnerBillReport::class,"id","owner_bill_report_id");
+    }
+
+    /* 结算月格式转换，仅截取至月
+     * 引用：CreateOwnerReport
+     */
+    public function getCountingMonthAttribute($value)
+    {
+        return substr($value,0,7);
+    }
+}

app/OwnerStoragePriceModel.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class OwnerStoragePriceModel extends Model
+{
+    protected $fillable = [
+        "counting_type",    //计费类型
+        "using_type",       //用仓类型
+        "minimum_area",     //最低起租面积
+        "price",            //单价
+        "discount_type",    //减免类型
+        "discount_value",   //减免值
+        "unit_id",          //单位ID
+    ];
+
+    public function unit()
+    {   //单位
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
+}

app/ProcessMethod.php

@@ -8,5 +8,10 @@ use App\Traits\ModelTimeFormat;
 class ProcessMethod extends Model
 {
     use ModelTimeFormat;
-    protected $fillable=['name'];
+    protected $fillable=['name',"unit_id","unit_price"];
+
+    public function unit()
+    {   //单位
+        return $this->hasOne(Unit::class,"id","unit_id");
+    }
 }

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Customer;
 use App\Http\Controllers\Controller;
 use App\Services\AuthorityService;
 use App\Services\CacheService;
@@ -9,6 +10,7 @@ use App\Services\CommodityService;
 use App\Services\common\BatchUpdateService;
 use App\Services\CommodityBarcodeService;
 use App\Services\common\DataHandlerService;
+use App\Services\CustomerService;
 use App\Services\DepositoryService;
 use App\Services\InventoryAccountMissionService;
 use App\Services\InventoryCompareService;
@@ -28,6 +30,7 @@ use App\Services\OrderService;
 use App\Services\OrderIssueWorkLoadService;
 use App\Services\OrderPackageCommoditiesService;
 use App\Services\OrderTrackingService;
+use App\Services\OwnerReportService;
 use App\Services\OwnerService;
 use App\Services\PackageStatisticsService;
 use App\Services\ProcessesContentService;
@@ -42,6 +45,7 @@ use App\Services\StoreCheckingReceiveItemService;
 use App\Services\StoreCheckingReceiveService;
 use App\Services\StoreItemService;
 use App\Services\StoreService;
+use App\Services\UserOwnerGroupService;
 use App\Services\UserService;
 use App\Services\WarehouseService;
 use App\Services\WaybillFinancialService;
@@ -152,12 +156,12 @@ class AppServiceProvider extends ServiceProvider
 
     private function loadingBasedModuleService(){
         app()->singleton("ShopService", ShopService::class);
-        //app()->singleton("logisticService", LogisticService::class);
-        //app()->singleton('OwnerService',OwnerService::class);
         app()->singleton('CommodityService', CommodityService::class);
         app()->singleton('BatchUpdateService', BatchUpdateService::class);
         app()->singleton('DataHandlerService',DataHandlerService::class);
         app()->singleton('DepositoryService',DepositoryService::class);
+        app()->singleton('UserOwnerGroupService',UserOwnerGroupService::class);
+        app()->singleton('CustomerService',CustomerService::class);
     }
 
     private function loadingRejectedModuleService(){

app/Services/CustomerService.php

@@ -0,0 +1,14 @@
+<?php 
+
+namespace App\Services; 
+
+use App\Customer;
+
+Class CustomerService
+{
+    public function getSelection($column = ['id', 'name'])
+    {
+        return Customer::query()->select($column)->get();
+    }
+
+}

app/Services/OwnerReportService.php

@@ -0,0 +1,67 @@
+<?php 
+
+namespace App\Services; 
+
+use App\OwnerReport;
+use App\Services\common\QueryService;
+use Illuminate\Database\Eloquent\Builder;
+
+Class OwnerReportService
+{
+    /**
+     * @param Builder $builder
+     * @param array $params
+     * @return Builder
+     */
+    private function query(Builder $builder, array $params)
+    {
+        $columnQueryRules = [
+            'counting_month_start' => ['alias' => 'counting_month', 'startDate' => '-01'],
+            'counting_month_end' => ['alias' => 'counting_month', 'endDate' => '-31'],
+            'owner_id' => ['multi' => ','],
+        ];
+        if ($params["owner_group_id"] ?? false){
+            $builder->whereHas('owner',function ($query)use(&$params){
+                /** @var Builder $query */
+                $query->where("user_owner_group_id",$params["owner_group_id"]);
+            });
+            unset($params["owner_group_id"]);
+        }
+        if ($params["customer_id"] ?? false){
+            $builder->whereHas('owner',function ($query)use(&$params){
+                /** @var Builder $query */
+                $query->where("customer_id",$params["customer_id"]);
+            });
+            unset($params["customer_id"]);
+        }
+        if ($params["status"] ?? false){
+            $builder->whereHas('owner',function ($query)use(&$params){
+                /** @var Builder $query */
+                if ($params["status"] == "激活") $query->whereNull("deleted_at");
+                else $query->whereNotNull("deleted_at");
+            });
+            unset($params["status"]);
+        }
+        return app(QueryService::class)->query($params, $builder, $columnQueryRules,"owner_reports");
+    }
+
+    public function get(array $params, array $withs = null)
+    {
+        $query = OwnerReport::query();
+        if ($withs)$query->with($withs);
+        return $this->query($query,$params)->get();
+    }
+
+    public function paginate(array $params, array $withs = null)
+    {
+        $query = OwnerReport::query()->orderByDesc('id');
+        if ($withs)$query->with($withs);
+        return $this->query($query,$params)->paginate($params["paginate"] ?? 50);
+    }
+
+    public function getSql(array $params)
+    {
+
+    }
+
+}

app/Services/OwnerService.php

@@ -4,7 +4,9 @@ namespace App\Services;
 
 use App\OracleBasCustomer;
 use App\Owner;
+use App\User;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 
 Class OwnerService
@@ -18,7 +20,7 @@ Class OwnerService
      * array | string $column
      * 默认一些select字段,可传递string 或 array来指定select字段
      */
-    public function getSelection($column = ['id', 'name'])
+    public function getSelection(array $column = ['id', 'name'])
     {
         return $this->cacheService->getOrExecute('OwnersAll_IdName',function()use($column){
             return Owner::filterAuthorities()->select($column)->get();
@@ -149,4 +151,35 @@ Class OwnerService
         return Owner::query()->whereIn('id',app('UserService')->getPermittingOwnerIds($user)??[])->get();
     }
 
+    public function get(array $params, array $withs = null, bool $authority = true, bool $notShowSoftDelete = false)
+    {
+        /** @var User $user */
+        $user = Auth::user();
+        $query = Owner::query();
+        if ($authority){
+            $ids = $user->getPermittingOwnerIdsAttribute();
+            if ($ids) $query->whereIn("id",$ids);
+            else return null;
+        }
+        if ($notShowSoftDelete) $query->whereNull('deleted_at');
+        $query = $this->query($query,$params);
+        return $query->get();
+    }
+
+    private function query(Builder $builder, array $params)
+    {
+        foreach ($params as $column => $param){
+            if ($param === true){
+                $builder->whereNotNull($column);
+                continue;
+            }
+            if ($param === false){
+                $builder->whereNull($column);
+                continue;
+            }
+            $builder->where($column,$params);
+        }
+        return $builder;
+    }
+
 }

app/Services/UserOwnerGroupService.php

@@ -0,0 +1,15 @@
+<?php 
+
+namespace App\Services; 
+
+
+use App\UserOwnerGroup;
+
+Class UserOwnerGroupService
+{
+    public function getSelection($column = ['id', 'name'])
+    {
+        return UserOwnerGroup::query()->select($column)->get();
+    }
+
+}

app/Services/WaybillService.php

@@ -20,8 +20,7 @@ Class WaybillService
         $waybills = Waybill::filterAuthorities()->with(['owner','carrier','originationCity','destinationCity'=>function($query){
             $query->with('province');
         },'uploadFile','amountUnit','priceModel','warehouseWeightUnit','carrierWeightUnit',
-            'warehouseWeightUnitOther','carrierWeightUnitOther','carType','uploadFile',
-            'wmsCommodities','waybillAuditLogs' => function ($query) {
+            'warehouseWeightUnitOther','carrierWeightUnitOther','carType','uploadFile','waybillAuditLogs' => function ($query) {
             $query->with('user');
         }])->selectRaw('waybills.* ,waybill_on_tops.id top_id ,waybill_on_tops.remark,waybill_on_tops.updated_at top_update')
             ->leftJoin('waybill_on_tops','waybill_on_tops.waybill_id','=','waybills.id')

app/UserOwnerGroup.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserOwnerGroup extends Model
+{
+    protected $fillable = [
+        "name"  //名称
+    ];
+}

database/factories/AuthorityFactory.php

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

database/factories/CommodityBarcodeFactory.php

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

database/factories/CommodityFactory.php

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

database/factories/CustomFieldFactory.php

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

database/factories/CustomerFactory.php

@@ -0,0 +1,14 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\Customer;
+use Faker\Generator as Faker;
+
+$factory->define(Customer::class, function (Faker $faker) {
+    return [
+        "code" => \Illuminate\Support\Str::random(5).date('yymmdd'),         //客户名称
+        "name" => $faker->name,         //客户代码
+        "company_name" => $faker->name  //公司名称
+    ];
+});

database/factories/DepositoryFactory.php

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

database/factories/InventoryFactory.php

@@ -1,23 +0,0 @@
-<?php
-
-/** @var \Illuminate\Database\Eloquent\Factory $factory */
-
-use App\InventoryAccount;
-use App\Owner;
-use Faker\Generator as Faker;
-
-$factory->define(InventoryAccount::class, function (Faker $faker) {
-    $owners=Owner::select('id')->get();
-    return [
-        'owner_id'=>$owners[1],
-        'type'=>'动盘',
-        'start_at'=>now(),
-        'end_at'=>now(),
-        'total'=>3,
-        'processed'=>0,
-        'difference'=>0,
-        'returned'=>0,
-        'deleted_at'=>null,
-        'created_at'=>now(),
-    ];
-});

database/factories/InventoryMissionFactory.php

@@ -1,31 +0,0 @@
-<?php
-
-/** @var \Illuminate\Database\Eloquent\Factory $factory */
-
-use App\InventoryAccountMission;
-use App\Commodity;
-use Faker\Generator as Faker;
-use Illuminate\Support\Str;
-
-$factory->define(InventoryAccountMission::class, function (Faker $faker) {
-    $commoditys=Commodity::get();
-    return [
-        'inventory_account_id'=>'',
-        'location'=>Str::random(5),
-        'commodity_id'=>$commoditys[0]['id'],
-        'produced_at'=>'',
-        'valid_at'=>'',
-        'stored_at'=>'',
-        'batch_number'=>'',
-        'erp_type_position'=>'',
-        'quality'=>'',
-        'stored_amount'=>50,
-        'valid_amount'=>'',
-        'verified_amount'=>'',
-        're_checked_amount'=>'',
-        'difference_amount'=>'',
-        'occupied_amount'=>'',
-        'checked'=>'否',
-        'returned'=>'无',
-    ];
-});

database/factories/LogFactory.php

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

database/factories/LogisticFactory.php

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

database/factories/LogisticNumberFeatureFactory.php

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

database/factories/MeasuringMachineFactory.php

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

database/factories/OrderFactory.php

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

database/factories/OrderIssueFactory.php

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

database/factories/OrderIssueOnTopFactory.php

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

database/factories/OrderIssueProcessLogFactory.php

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

database/factories/OrderIssueTypeFactory.php

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

database/factories/OrderItemsFactory.php

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

database/factories/OrderOnTopFactory.php

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

database/factories/OrderPackageCommoditiesFactory.php

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

database/factories/OrderPackageFactory.php

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

database/factories/OrderTrackingFactory.php

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

database/factories/OrderTrackingOwnerFactory.php

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

database/factories/OwnerBillReportFactory.php

@@ -0,0 +1,20 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OwnerBillReport;
+use Faker\Generator as Faker;
+
+$factory->define(OwnerBillReport::class, function (Faker $faker) {
+    $owner = \App\Owner::query()->whereNotNull("user_owner_group_id")->first();
+    $initial_fee = mt_rand(0,50000) / 10;
+    $confirm_fee = mt_rand(0,50000) / 10;
+    return [
+        "owner_id" => $owner ? $owner->id : factory(\App\Owner::class),       //项目ID
+        "counting_month" => $faker->date(), //结算月
+        "initial_fee" => $initial_fee,    //原始账单金额
+        "confirm_fee" => $confirm_fee,    //确认账单金额
+        "difference" => $confirm_fee - $initial_fee,     //差额
+        "confirmed" => "否",      //确认状态
+    ];
+});

database/factories/OwnerFactory.php

@@ -7,6 +7,17 @@ use Faker\Generator as Faker;
 
 $factory->define(Owner::class, function (Faker $faker) {
     return [
-        //
+        'name' => $faker->name,                 //名称
+        'code' => \Illuminate\Support\Str::random(5).date('yymmdd'),                 //代码
+        'checking_count' => mt_rand(0,5),       //审核数量
+        "customer_id" => factory(App\Customer::class),          //客户ID
+        "tax_rate" => mt_rand(0,100) / 10,             //税率
+        "contract_number" => \Illuminate\Support\Str::random(5).date('yymmdd'),      //合同号
+        "salesman" => $faker->name,             //销售名称
+        "linkman" => $faker->name,              //联系人
+        "phone_number" => $faker->phoneNumber,         //联系电话
+        "user_owner_group_id" => factory(\App\UserOwnerGroup::class),  //项目组ID
+        "waring_line_on" => mt_rand(0,1000),       //月单量预警
+        "description" => $faker->text           //描述
     ];
 });

database/factories/OwnerReportFactory.php

@@ -0,0 +1,17 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\OwnerReport;
+use Faker\Generator as Faker;
+
+$factory->define(OwnerReport::class, function (Faker $faker) {
+    return [
+        "owner_id" => factory(App\Owner::class),                     //货主ID
+        "counting_month" => $faker->date(),               //结算月
+        "daily_average_order_amount" => mt_rand(0,10000),  //日均单量
+        "current_month_counting_area" => mt_rand(100,100000) / 50,  //结算月盘点面积
+        "last_month_counting_area"   => mt_rand(100,100000) / 50,  //结算月上月盘点面积
+        "owner_bill_report_id"  =>factory(App\OwnerBillReport::class)        //账单ID
+    ];
+});

database/factories/PaperBoxFactory.php

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

database/factories/QualityLabelFactory.php

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

database/factories/RejectedBillFactory.php

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

database/factories/RejectedBillItemFactory.php

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

database/factories/RejectedFactory.php

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

database/factories/RejectedItemFactory.php

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

database/factories/RoleFactory.php

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

database/factories/ShopFactory.php

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

database/factories/StoreFactory.php

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

database/factories/StoreItemsFactory.php

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

database/factories/LogisticTimingFactory.php → database/factories/UserOwnerGroupFactory.php

@@ -2,11 +2,11 @@
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 
-use App\LogisticTiming;
+use App\UserOwnerGroup;
 use Faker\Generator as Faker;
 
-$factory->define(LogisticTiming::class, function (Faker $faker) {
+$factory->define(UserOwnerGroup::class, function (Faker $faker) {
     return [
-        //
+        "name"  => $faker->name
     ];
 });

database/factories/WMSWaybillFactory.php

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

database/factories/WMSWaybillOrderFactory.php

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

database/factories/WarehouseFactory.php

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

database/factories/WaybillOnTopFactory.php

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

database/migrations/2020_10_20_134819_create_customers_table.php

@@ -7,33 +7,6 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateCustomersTable extends Migration
 {
-    protected $authNames=[
-        '客户管理',
-        '客户管理-项目',
-        '客户管理-项目-报表',
-        '客户管理-项目-查询',
-        '客户管理-项目-录入',
-        '客户管理-项目-面积',
-        '客户管理-财务-即时账单',
-        '客户管理-财务-账单确认',
-        '计费模型-仓储',
-        '计费模型-仓储-录入',
-        '客户',
-        '客户-查询',
-        '客户-录入',
-        '项目组',
-        '项目组-查询',
-        '项目组-录入',
-        '作业类型',
-        '作业类型-查询',
-        '作业类型-录入',
-        '特征',
-        '特征-录入',
-        '特征-查询',
-        '计费模型-作业',
-        '计费模型-作业-查询',
-        '计费模型-作业-录入',
-    ];
     /**
      * Run the migrations.
      *
@@ -48,9 +21,6 @@ class CreateCustomersTable extends Migration
             $table->string('company_name')->comment('公司名称');
             $table->timestamps();
         });
-        foreach ($this->authNames as $name){
-            if(!Authority::query()->where('name',$name)->first())(new Authority(['name'=>$name,'alias_name'=>$name]))->save();
-        }
     }
 
     /**
@@ -61,8 +31,5 @@ class CreateCustomersTable extends Migration
     public function down()
     {
         Schema::dropIfExists('customers');
-        foreach ($this->authNames as $name){
-            Authority::query()->where('name',$name)->delete();
-        }
     }
 }

database/migrations/2020_10_27_142647_create_owner_storage_price_model_table.php

@@ -19,7 +19,7 @@ class CreateOwnerStoragePriceModelTable extends Migration
             $table->enum("using_type",["常温","恒温"])->default("常温")->comment('用仓类型');
             $table->decimal("minimum_area")->default(0)->comment("最低起租面积");
             $table->decimal("price",8,3)->comment("单价");
-            $table->enum("discount_type",["无减免","按单减免","固定减免"])->default("无减免")->comment("最低起租面积");
+            $table->enum("discount_type",["无减免","按单减免","固定减免"])->default("无减免")->comment("减免类型");
             $table->decimal("discount_value")->nullable()->comment("减免值");
             $table->bigInteger("unit_id")->nullable()->index()->comment("外键单位");
             $table->timestamps();

database/migrations/2020_10_27_162056_add_column_unit_id_table_process_methods.php

@@ -14,7 +14,8 @@ class AddColumnUnitIdTableProcessMethods extends Migration
     public function up()
     {
         Schema::table('process_methods', function (Blueprint $table) {
-            $table->bigInteger("unit_id")->nullable()->index()->comment('单位');
+            $table->bigInteger("unit_id")->nullable()->index()->comment('外键单位');
+            $table->decimal("unit_price",8,4)->nullable()->comment("单价");
         });
     }
 
@@ -27,6 +28,7 @@ class AddColumnUnitIdTableProcessMethods extends Migration
     {
         Schema::table('process_methods', function (Blueprint $table) {
             $table->dropColumn("unit_id");
+            $table->dropColumn("unit_price");
         });
     }
 }

database/migrations/2020_10_28_162458_create_owner_price_expresses_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceExpressesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_expresses', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->comment("价格名称");
+            $table->bigInteger("initial_weight_unit_id")->index()->comment("首重单位");
+            $table->bigInteger("additional_weight_unit_id")->index()->comment("续重单位");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_expresses');
+    }
+}

database/migrations/2020_10_28_162533_create_owner_price_expresses_provinces_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceExpressesProvincesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_express_provinces', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger("owner_price_express_id")->index()->comment("外键快递价格");
+            $table->bigInteger("province_id")->index()->comment("外键省份");
+            $table->decimal("initial_weight_price",8,4)->comment("初始单价");
+            $table->decimal("additional_weight_price",8,4)->comment("续重单价");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_expresses_provinces');
+    }
+}

database/migrations/2020_10_28_162651_create_owner_price_express_owner_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceExpressOwnerTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_express_owner', function (Blueprint $table) {
+            $table->bigInteger("owner_price_express_id")->index()->comment("外键快递价格");
+            $table->bigInteger("owner_id")->index()->comment("外键货主");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_express_owner');
+    }
+}

database/migrations/2020_10_28_162743_create_owner_price_express_logistic_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceExpressLogisticTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_express_logistic', function (Blueprint $table) {
+            $table->bigInteger("owner_price_express_id")->index()->comment("外键快递价格");
+            $table->bigInteger("logistic_id")->index()->comment("外键快递");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_express_logistic');
+    }
+}

database/migrations/2020_10_28_170858_save_customer_authority_data.php

@@ -0,0 +1,67 @@
+<?php
+
+use App\Authority;
+use Illuminate\Database\Migrations\Migration;
+
+class SaveCustomerAuthorityData extends Migration
+{
+    protected $authNames=[
+        '客户管理',
+        '客户管理-项目',
+        '客户管理-项目-报表',
+        '客户管理-项目-查询',
+        '客户管理-项目-录入',
+        '客户管理-项目-面积',
+        '客户管理-财务-即时账单',
+        '客户管理-财务-账单确认',
+        '计费模型-仓储',
+        '计费模型-仓储-录入',
+        '客户',
+        '客户-查询',
+        '客户-录入',
+        '项目组',
+        '项目组-查询',
+        '项目组-录入',
+        '作业类型',
+        '作业类型-查询',
+        '作业类型-录入',
+        '特征',
+        '特征-录入',
+        '特征-查询',
+        '计费模型-作业',
+        '计费模型-作业-查询',
+        '计费模型-作业-录入',
+        '计费模型-快递',
+        '计费模型-快递-查询',
+        '计费模型-快递-录入',
+        '计费模型-物流',
+        '计费模型-物流-查询',
+        '计费模型-物流-录入',
+        '计费模型-直发',
+        '计费模型-直发-查询',
+        '计费模型-直发-录入',
+    ];
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        foreach ($this->authNames as $name){
+            if(!Authority::query()->where('name',$name)->first())(new Authority(['name'=>$name,'alias_name'=>$name]))->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        foreach ($this->authNames as $name){
+            Authority::query()->where('name',$name)->delete();
+        }
+    }
+}

database/migrations/2020_10_28_175756_create_owner_price_logistics_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceLogisticsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_logistics', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->comment("名称");
+            $table->string("unit_range")->nullable()->comment("单位一区间");
+            $table->bigInteger("unit_id")->index()->comment("外键单位：单位一");
+            $table->string("other_unit_range")->nullable()->comment("单位二区间");
+            $table->bigInteger("other_unit_id")->index()->comment("外键单位：单位二");
+            $table->decimal("pick_up_price",8,4)->nullable()->comment("提货费");
+            $table->decimal("fuel_price",8,4)->nullable()->comment("燃油附加费");
+            $table->decimal("service_price",8,4)->nullable()->comment("信息服务费");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_logistics');
+    }
+}

database/migrations/2020_10_28_175828_create_owner_price_logistic_details_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceLogisticDetailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_logistic_details', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger("owner_price_logistic_id")->index()->comment("外键物流计费");
+            $table->bigInteger("unit_id")->index()->comment("单位");
+            $table->string("range")->nullable()->comment("区间");
+            $table->bigInteger("province_id")->nullable()->index()->comment("外键省份");
+            $table->bigInteger("city_id")->nullable()->index()->comment("外键城市");
+            $table->decimal("unit_price",8,4)->nullable()->comment("单价");
+            $table->decimal("delivery_fee",8,4)->nullable()->comment("送货费");
+            $table->decimal("initial_fee",8,4)->nullable()->comment("起始计费");
+            $table->integer("initial_amount")->nullable()->comment("起始计数");
+            $table->decimal("rate")->nullable()->comment("费率");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_logistic_details');
+    }
+}

database/migrations/2020_10_28_175905_create_owner_price_logistic_owner_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceLogisticOwnerTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_logistic_owner', function (Blueprint $table) {
+            $table->bigInteger("owner_price_logistic_id")->comment("外键物流计费");
+            $table->bigInteger("owner_id")->comment("外键货主");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_logistic_owner');
+    }
+}

database/migrations/2020_10_28_175928_create_owner_price_logistic_logistic_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceLogisticLogisticTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_logistic_logistic', function (Blueprint $table) {
+            $table->bigInteger("owner_price_logistic_id")->comment("外键物流计费");
+            $table->bigInteger("logistic_id")->comment("外键承运商");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_logistic_logistic');
+    }
+}

database/migrations/2020_10_29_103017_create_owner_price_direct_logistics_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceDirectLogisticsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_direct_logistics', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->nullable()->comment("价格名称");
+            $table->decimal("base_km")->nullable()->comment("起步公里数");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_direct_logistics');
+    }
+}

database/migrations/2020_10_29_103104_create_owner_price_direct_logistic_cars_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOwnerPriceDirectLogisticCarsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('owner_price_direct_logistic_cars', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger("owner_price_direct_logistic_id")->index('opdl_opdlc_index')->comment("外键直发计费");
+            $table->bigInteger("car_type_id")->index()->comment("车型");
+            $table->decimal("base_fee",8,4)->nullable()->comment("起步费");
+            $table->decimal("additional_fee",8,4)->comment("续费(元/KM)");
+            $table->timestamps();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('owner_price_direct_logistic_cars');
+    }
+}

database/migrations/2020_10_29_144729_create_user_owner_groups_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserOwnerGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_owner_groups', function (Blueprint $table) {
+            $table->id();
+            $table->string("name")->unique()->comment("项目组名称");
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_owner_groups');
+    }
+}

database/seeds/CarTypesSeeder.php

@@ -1,22 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class CarTypesSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        \App\CarType::create([
-            'name'=>'东风',
-            'model'=>'mnb102',
-            'length'=>5.5,
-            'load'=>18.2,
-            'remark'=>'勤'
-        ]);
-    }
-}

database/seeds/CarriersSeeder.php

@@ -1,20 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class CarriersSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        \App\Carrier::create([
-            'name'=>'货拉拉',
-            'mobile'=>'012-58414542',
-            'remark'=>'大件'
-        ]);
-    }
-}

database/seeds/CitiesSeeder.php

@@ -1,21 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class CitiesSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        \App\City::create([
-            'province_id'=>1,
-            'name'=>'廊坊'
-        ]);
-
-
-    }
-}

database/seeds/CustomFieldSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class CustomFieldSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/DatabaseSeeder.php

@@ -12,5 +12,8 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         // $this->call(UsersTableSeeder::class);
+        $this->call([
+            OwnerReportSeeder::class,
+        ]);
     }
 }

database/seeds/LogisticTimingSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class LogisticTimingSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderIssueOnTopSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderIssueOnTopSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderIssueSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderIssueSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderIssueTypeSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderIssueTypeSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderItemsSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderItemsSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderOnTopSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderOnTopSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}

database/seeds/OrderPackageCommoditiesSeeder.php

@@ -1,16 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-
-class OrderPackageCommoditiesSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        //
-    }
-}