添加卸货模块 迁移文件,模型,控制器,Service,factory,seeder,

app/DischargeProvider.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use App\Traits\ModelTimeFormat;
+use Illuminate\Database\Eloquent\Model;
+
+use App\Traits\ModelLogChanging;
+
+class DischargeProvider extends Model
+{
+    use ModelLogChanging;
+    use ModelTimeFormat;    protected $fillable = ['name'];
+}

app/DischargeTask.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App;
+
+use App\Traits\ModelTimeFormat;
+use Illuminate\Database\Eloquent\Model;
+
+use App\Traits\ModelLogChanging;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+
+class DischargeTask extends Model
+{
+    use ModelLogChanging;
+    use ModelTimeFormat;
+
+    const status = [
+        '创建',
+        '接单',
+        '作业中',
+        '完成'
+    ];
+
+    const types = [
+        '装车',
+        '卸车'
+    ];
+
+    const units = [
+        'm3',
+        '吨',
+        '托',
+        '件'
+    ];
+
+    protected $fillable = [
+        'owner_id','type','numbers','status',
+        'income_amount','income_unit','income_unit_price','income_total_cost','income_remark',
+        'discharge_provider_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark',
+    ];
+
+    function dischargeProvider(): HasOne
+    {
+        return $this->hasOne(DischargeProvider::class);
+    }
+
+}

app/Http/Controllers/DischargeProviderController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\DischargeProvider;
+use Illuminate\Http\Request;
+
+class DischargeProviderController 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\DischargeProvider  $dischargeProvider
+     * @return \Illuminate\Http\Response
+     */
+    public function show(DischargeProvider $dischargeProvider)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\DischargeProvider  $dischargeProvider
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(DischargeProvider $dischargeProvider)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\DischargeProvider  $dischargeProvider
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, DischargeProvider $dischargeProvider)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\DischargeProvider  $dischargeProvider
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(DischargeProvider $dischargeProvider)
+    {
+        //
+    }
+}

app/Http/Controllers/DischargeTaskController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\DischargeTask;
+use Illuminate\Http\Request;
+
+class DischargeTaskController 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\DischargeTask  $dischargeTask
+     * @return \Illuminate\Http\Response
+     */
+    public function show(DischargeTask $dischargeTask)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\DischargeTask  $dischargeTask
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(DischargeTask $dischargeTask)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\DischargeTask  $dischargeTask
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, DischargeTask $dischargeTask)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\DischargeTask  $dischargeTask
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(DischargeTask $dischargeTask)
+    {
+        //
+    }
+}

app/Providers/AppServiceProvider.php

@@ -14,6 +14,7 @@ use App\Services\CustomerLogService;
 use App\Services\CustomerLogStatusService;
 use App\Services\CustomerService;
 use App\Services\DepositoryService;
+use App\Services\DischargeProviderService;
 use App\Services\FeatureService;
 use App\Services\ForeignHaiRoboticsService;
 use App\Services\InventoryAccountMissionService;
@@ -93,13 +94,14 @@ use App\Services\WeighExceptedService;
 use App\Services\OrderFreezeService;
 use App\Services\RegionService;
 use App\Services\UserWorkgroupService;
-use App\Services\DeliveryAppointment;
+use App\Services\DischargeTaskService;
 use App\Services\DeliveryAppointmentService;
 use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
+
 use Ramsey\Uuid\Uuid;
 use Illuminate\Support\Facades\Validator;
 
@@ -146,6 +148,7 @@ class AppServiceProvider extends ServiceProvider
 
     private function loadingService(){
         app()->singleton('AllInventoryService',AllInventoryService::class);
+        app()->singleton('ApiUserService',\App\Services\api\UserService::class);
         app()->singleton('AuthorityService',AuthorityService::class);
         app()->singleton('BatchService',BatchService::class);
         app()->singleton('BatchUpdateService', BatchUpdateService::class);
@@ -162,6 +165,8 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('DeliveryAppointment',DeliveryAppointment::class);
         app()->singleton('DeliveryAppointmentService',DeliveryAppointmentService::class);
         app()->singleton('DepositoryService',DepositoryService::class);
+        app()->singleton('DischargeProviderService',DischargeProviderService::class);
+        app()->singleton('DischargeTaskService',DischargeTaskService::class);
         app()->singleton('FeatureService',FeatureService::class);
         app()->singleton('ForeignHaiRoboticsService',ForeignHaiRoboticsService::class);
         app()->singleton('InventoryAccountMissionService',InventoryAccountMissionService::class);
@@ -193,6 +198,7 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('OwnerAreaReportService',OwnerAreaReportService::class);
         app()->singleton('OwnerBillReportService',OwnerBillReportService::class);
         app()->singleton('OwnerFeeDetailService',OwnerFeeDetailService::class);
+        app()->singleton('OwnerMaterialService',OwnerMaterialService::class);
         app()->singleton('OwnerPriceDirectLogisticService',OwnerPriceDirectLogisticService::class);
         app()->singleton('OwnerPriceExpressService',OwnerPriceExpressService::class);
         app()->singleton('OwnerPriceLogisticService',OwnerPriceLogisticService::class);
@@ -201,16 +207,15 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('OwnerReportService',OwnerReportService::class);
         app()->singleton('OwnerService',OwnerService::class);
         app()->singleton('OwnerStoragePriceModelService',OwnerStoragePriceModelService::class);
-        app()->singleton('OwnerMaterialService',OwnerMaterialService::class);
         app()->singleton('PackageService',PackageService::class);
         app()->singleton('PackageStatisticsService',PackageStatisticsService::class);
         app()->singleton('ProcessMethodService',ProcessMethodService::class);
         app()->singleton('ProcessService',ProcessService::class);
         app()->singleton('ProcessStatisticService',ProcessStatisticService::class);
         app()->singleton('ProcessesContentService',ProcessesContentService::class);
-        app()->singleton('ProvinceService',ProvinceService::class);
         app()->singleton('ProcurementService',ProcurementService::class);
         app()->singleton('ProcurementTotalBillService',ProcurementTotalBillService::class);
+        app()->singleton('ProvinceService',ProvinceService::class);
         app()->singleton('RealtimePendingOrdersService',RealtimePendingOrdersService::class);
         app()->singleton('RegionService',RegionService::class);
         app()->singleton('RejectedBillItemService',RejectedBillItemService::class);
@@ -235,7 +240,6 @@ class AppServiceProvider extends ServiceProvider
         app()->singleton('UnitService',UnitService::class);
         app()->singleton('UserOwnerGroupService',UserOwnerGroupService::class);
         app()->singleton('UserService',UserService::class);
-        app()->singleton('ApiUserService',\App\Services\api\UserService::class);
         app()->singleton('UserWorkgroupService',UserWorkgroupService::class);
         app()->singleton('WarehouseService',WarehouseService::class);
         app()->singleton('WaybillFinancialService',WaybillFinancialService::class);

app/Services/DischargeProviderService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Services;
+
+use App\Traits\ServiceAppAop;
+use App\DischargeProvider;
+
+class DischargeProviderService
+{
+    use ServiceAppAop;
+    protected $modelClass=DischargeProvider::class;
+
+}

app/Services/DischargeTaskService.php

@@ -0,0 +1,13 @@
+<?php 
+
+namespace App\Services;
+
+use App\Traits\ServiceAppAop;
+use App\DischargeTask;
+
+class DischargeTaskService
+{
+    use ServiceAppAop;
+    protected $modelClass=DischargeTask::class;
+
+}

database/factories/DischargeProviderFactory.php

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

database/factories/DischargeTaskFactory.php

@@ -0,0 +1,27 @@
+<?php
+
+/** @var Factory $factory */
+
+use App\DischargeTask;
+use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factory;
+
+$factory->define(DischargeTask::class, function (Faker $faker) {
+    return [
+         'owner_id',
+        'type' => $faker->numberBetween(0, 1),
+        'numbers' => $faker->name(11),
+        'status' => $faker->numberBetween(0, 3),
+        'income_amount' => $faker->numberBetween(0, 20),
+        'income_unit' => $faker->numberBetween(0, 2),
+        'income_unit_price' => $faker->numberBetween(0, 10),
+        'income_total_cost' => $faker->numberBetween(0, 100),
+        'income_remark' => $faker->title(),
+        'discharge_provider_id' => $faker->numberBetween(0, 10),
+        'expenditure_amount' => $faker->numberBetween(0, 20),
+        'expenditure_unit' => $faker->numberBetween(0, 2),
+        'expenditure_unit_price' => $faker->numberBetween(0, 10),
+        'expenditure_total_cost' => $faker->numberBetween(0, 100),
+        'expenditure_remark' => $faker->title(),
+    ];
+});

database/migrations/2021_03_18_162505_create_discharge_tasks_table.php

@@ -0,0 +1,57 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateDischargeTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('discharge_tasks', function (Blueprint $table) {
+            /**
+             *  'owner_id','type','numbers','status',
+            'income_amount','income_unit','income_unit_price','income_total_cost','income_remark',
+            'discharge_provider_id','expenditure_amount','expenditure_unit','expenditure_unit_price','expenditure_total_cost','expenditure_remark',
+             */
+            $table->bigIncrements('id');
+            $table->bigInteger('owner_id')->comment('货主id');
+
+            $table->tinyInteger('type')->comment('作业名称');
+            $table->string('numbers')->comment('入库单号');
+            $table->tinyInteger('status')->comment('状态');
+
+
+            $table->integer('income_amount')->comment('收入数量');
+            $table->tinyInteger('income_unit')->comment('收入单位');
+            $table->decimal('income_unit_price')->comment('收入单价');
+            $table->decimal('income_total_cost')->comment('收入合计');
+            $table->string('income_remark')->comment('收入描述');
+
+            $table->bigInteger('discharge_provider_id');
+
+            $table->integer('expenditure_amount')->comment('收入数量');
+            $table->tinyInteger('expenditure_unit')->comment('收入单位');
+            $table->decimal('expenditure_unit_price')->comment('收入单价');
+            $table->decimal('expenditure_total_cost')->comment('收入合计');
+            $table->string('expenditure_remark')->comment('收入合计');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('discharge_tasks');
+    }
+}

database/migrations/2021_03_18_163135_create_discharge_providers_table.php

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

database/seeds/DischargeProviderSeeder.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\DischargeProvider;
+use Illuminate\Database\Seeder;
+
+class DischargeProviderSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $params = factory(DischargeProvider::class)->times(10)->make()->toArray();
+        DischargeProvider::query()->insert($params);
+    }
+}

database/seeds/DischargeTaskSeeder.php

@@ -0,0 +1,18 @@
+<?php
+
+use App\DischargeTask;
+use Illuminate\Database\Seeder;
+
+class DischargeTaskSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $params = factory(DischargeTask::class)->times(10)->make()->toArray();
+        DischargeTask::query()->insert($params);
+    }
+}