始发市默认上海

bootstrap/cache/packages.php

@@ -17,6 +17,17 @@
       0 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
     ),
   ),
+  'facade/ignition' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
+    ),
+  ),
   'fideloper/proxy' => 
   array (
     'providers' => 
@@ -31,6 +42,13 @@
       0 => 'Laravel\\Tinker\\TinkerServiceProvider',
     ),
   ),
+  'laravel/ui' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Ui\\UiServiceProvider',
+    ),
+  ),
   'maatwebsite/excel' => 
   array (
     'providers' => 

bootstrap/cache/services.php

@@ -25,20 +25,22 @@
     21 => 'Illuminate\\View\\ViewServiceProvider',
     22 => 'Barryvdh\\Debugbar\\ServiceProvider',
     23 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    25 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    26 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    27 => 'Carbon\\Laravel\\ServiceProvider',
-    28 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    29 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    30 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    31 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    32 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    33 => 'App\\Providers\\AppServiceProvider',
-    34 => 'App\\Providers\\AuthServiceProvider',
-    35 => 'App\\Providers\\BroadcastServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
+    24 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    26 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    27 => 'Laravel\\Ui\\UiServiceProvider',
+    28 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    29 => 'Carbon\\Laravel\\ServiceProvider',
+    30 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    31 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    32 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    33 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    34 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    35 => 'App\\Providers\\AppServiceProvider',
+    36 => 'App\\Providers\\AuthServiceProvider',
+    37 => 'App\\Providers\\BroadcastServiceProvider',
+    38 => 'App\\Providers\\EventServiceProvider',
+    39 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -54,17 +56,21 @@
     9 => 'Illuminate\\View\\ViewServiceProvider',
     10 => 'Barryvdh\\Debugbar\\ServiceProvider',
     11 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    13 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    14 => 'Carbon\\Laravel\\ServiceProvider',
-    15 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    16 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    17 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    18 => 'App\\Providers\\AppServiceProvider',
-    19 => 'App\\Providers\\AuthServiceProvider',
-    20 => 'App\\Providers\\BroadcastServiceProvider',
-    21 => 'App\\Providers\\EventServiceProvider',
-    22 => 'App\\Providers\\RouteServiceProvider',
+    12 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    13 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    14 => 'Laravel\\Ui\\UiServiceProvider',
+    15 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    16 => 'Carbon\\Laravel\\ServiceProvider',
+    17 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    18 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    19 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    20 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    21 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    22 => 'App\\Providers\\AppServiceProvider',
+    23 => 'App\\Providers\\AuthServiceProvider',
+    24 => 'App\\Providers\\BroadcastServiceProvider',
+    25 => 'App\\Providers\\EventServiceProvider',
+    26 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (
@@ -76,6 +82,7 @@
     'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
     'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
     'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider',
     'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
     'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -83,23 +90,16 @@
     'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.db.wipe' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.preset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -117,10 +117,10 @@
     'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.cast.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.channel.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.component.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -131,7 +131,6 @@
     'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -146,17 +145,25 @@
     'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.stub.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.vendor.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
     'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
+    'mail.manager' => 'Illuminate\\Mail\\MailServiceProvider',
     'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.transport' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
     'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
@@ -173,9 +180,6 @@
     'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
     'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
     'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
-    'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    'Overtrue\\Pinyin\\Pinyin' => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    'pinyin' => 'Overtrue\\LaravelPinyin\\ServiceProvider',
   ),
   'when' => 
   array (
@@ -218,11 +222,5 @@
     'Laravel\\Tinker\\TinkerServiceProvider' => 
     array (
     ),
-    'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' => 
-    array (
-    ),
-    'Overtrue\\LaravelPinyin\\ServiceProvider' => 
-    array (
-    ),
   ),
 );

config/api.php

@@ -15,6 +15,7 @@ return [
     /** 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'=>[
         'receive'=>[
@@ -23,6 +24,9 @@ return [
         'package'=>[
             'new'=>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK' //通知WMS, 已称完的包裹
         ],
+        'waybill'=>[
+            'new'=>'http://47.103.72.58:19199/datahub/FluxBSJsonApi/BS_TMS/' //通知WMS, 已称完的包裹
+        ],
     ],
 
     'baidu'=>[

config/session.php

@@ -166,7 +166,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE', null),
 
     /*
     |--------------------------------------------------------------------------

database/factories/WMSWaybillFactory.php

@@ -0,0 +1,12 @@
+<?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

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

database/migrations/2019_11_22_094253_create_cities_table.php

@@ -52,6 +52,7 @@ class CreateCitiesTable extends Migration
         $Hunan=['长沙','株洲','湘潭','衡阳','邵阳','岳阳','常德','张家界','益阳','郴州','永州','怀化','娄底','吉首'];
         $Henan=['郑州','开封','洛阳','平顶山','安阳','鹤壁','新乡','焦作','濮阳','许昌','漯河','三门峡','商丘','周口','驻马店','南阳','信阳','济源'];
         $Hainan=['海口','三亚'];
+        $ShangHai=['上海'];
         $provinces=['陕西','甘肃','宁夏','青海','新疆','江苏','淅江','安徽','江西','福建','重庆','四川','云南',
             '贵州','西藏','黑龙江','吉林','辽宁','山东','北京','天津','广西','广东','河北','山西','内蒙古',
             '湖北','湖南','河南','海南','香港','澳门','台湾','上海'];
@@ -326,6 +327,15 @@ class CreateCitiesTable extends Migration
                     ]);
                 }
             }
+            if ($provinces[$i]=="上海"){
+                $province=\App\Province::where('name','=',$provinces[$i])->first();
+                for ($j=0;$j<count($Hainan);$j++){
+                    \App\City::create([
+                        'province_id'=>$province->id,
+                        'name'=>$ShangHai[$j],
+                    ]);
+                }
+            }
         }
     }
 

database/migrations/2020_03_05_080123_add_weigh_excepted_authority.php

@@ -37,7 +37,7 @@ class AddWeighExceptedAuthority extends Migration
     public function down()
     {
         foreach ($this->authNames as $name){
-            Authority::where('name','$name')->delete();
+            Authority::where('name',$name)->delete();
         }
     }
 

database/migrations/2020_04_28_141248_create_w_m_s_waybills_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateWMSWaybillsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('w_m_s_waybills', function (Blueprint $table) {
+            $table->string('OrderNo')->index()->comment('SO编号');
+            $table->string('CustomerID')->nullable()->comment('客户');
+            $table->string('CarrierID')->nullable()->comment('承运人');
+            $table->string('ConsigneeName')->nullable()->comment('收货人姓名');
+            $table->string('C_Tel')->nullable()->comment('收货人电话');
+            $table->string('C_Address1')->nullable()->comment('收货地址');
+            $table->string('C_Province')->nullable()->comment('省');
+            $table->string('C_City')->nullable()->comment('市');
+            $table->string('C_District')->nullable()->comment('区');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('w_m_s_waybills');
+    }
+}

database/migrations/2020_04_28_141405_create_w_m_s_waybill_orders_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateWMSWaybillOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('w_m_s_waybill_orders', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('OrderNo')->index()->comment('SO单号');
+            $table->string('SKU_Descr_c')->nullable()->comment('商品名称');
+            $table->string('SKU')->nullable()->comment('商品编码');
+            $table->string('Alternate_sku1')->nullable()->comment('条码');
+            $table->string('Qtyordered_each')->nullable()->comment('数量');
+            $table->string('Cubic')->nullable()->comment('体称');
+            $table->string('GrossWeight')->nullable()->comment('毛重');
+            $table->string('NetWeight')->nullable()->comment('净重');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('w_m_s_waybill_orders');
+    }
+}

public/js/app.js

@@ -61178,7 +61178,7 @@ var datetime = {
       time.target.value = time.target.value.replace(/^([3-9])([\d]{1})/, "2$2");
       time.target.value = time.target.value.replace(/^([2-9]{1})([4-9]{1})/, "$13");
       time.target.value = time.target.value.replace(/^([\d]{1})([\d]{1}):([6-9]{1})/, "$1$2:5");
-    }, 1);
+    }, 10);
   }
 };
 module.exports = datetime;

public/t.php

@@ -1,4 +1,4 @@
 <?php
 
 
-echo date('Y-m-d h:i:s', 1585274333);
+phpinfo();

resources/js/singles/rejectedIndex.js

@@ -272,6 +272,28 @@ let vueList=new Vue({
                 console.log(e);
             })
         },
+        confirmBeStored:function($e,id){
+            let _this=this;
+            axios.post(ajaxConfirmBeStoredUrl,{id:id}).then(function(response){
+                if(response.data.success){
+                    _this.rejectedBills.forEach(function(rejectedBill){
+                        if(rejectedBill.id===id){
+                            rejectedBill.is_loaded=1;
+                        }
+                    });
+                    tempTip.setDuration(1000);
+                    tempTip.showSuccess('确认入库成功');
+                }else{
+                    tempTip.setDuration(2500);
+                    tempTip.okWindow('数据异常无法确认！请在WMS确定入库状态后，勾选该条目手动修改相应入库状态！','知道了')
+                }
+            }).catch(function (e) {
+                alert('确认失败，网络连接错误：'+e);
+                tempTip.setDuration(2500);
+                tempTip.show('确认失败，网络连接错误：'+e);
+                console.log(e);
+            })
+        },
         finishAll:function(){
             let _this=this;
             if(_this.rejectedBills_checkBoxes.length===0){
@@ -356,6 +378,8 @@ let vueList=new Vue({
                 case 0:case '0':return '否';
                 case 1:case '1':return '是';
                 case 2:case '2':return '待推单';
+                case 3:case '3':return '交互异常';
+                case 4:case '4':return '待确认';
                 case null:case 'null':return '无需入库';
             }
             return '';

resources/views/maintenance/authority/create.blade.bak.php

@@ -0,0 +1,87 @@
+@extends('layouts.app')
+
+@section('content')
+    <div id="nav2">
+        @component('maintenance.menu')@endcomponent
+        @component('maintenance.authority.menu')@endcomponent
+    </div>
+    <div class="container-fluid mt-3">
+        <div class="card col-md-8 offset-md-2">
+            <div class="card-body">
+                @if(Session::has('successTip'))
+                    <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
+                @endif
+                @error('combinedName')
+                    <div class="alert alert-danger h1">{{ $message }}</div>
+                @enderror
+                <form method="POST" action="{{ url('maintenance/authority') }}">
+                    @csrf
+                    <div class="form-group row">
+                        <label for="name" class="col-2 col-form-label text-right">权限名称</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('name') is-invalid @enderror @error('combinedName') is-invalid @enderror"
+                                   name="name" autocomplete="off" value="{{ old('name') }}" placeholder="（唯一）" >
+                            @error('name')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="name" class="col-2 col-form-label text-right">关联货主</label>
+                        <div class="col-8">
+                            <div class="input-group">
+                                <select name="id_owner" id="id_owner" class="form-control @error('id_owner') is-invalid @enderror @error('combinedName') is-invalid @enderror">
+                                    <option value="" {{old("id_owner")==''?"selected":""}}></option>
+                                    @foreach($owners as $owner)
+                                        <option value="{{$owner->id}}" {{old("id_owner") == $owner->id ? "selected":""}}>{{$owner->name}}</option>
+                                    @endforeach
+                                </select>
+                                <input type="text" class="form-control input-group-prepend" placeholder="输入关键字定位货主名称"
+                                       name="locateOwnerSearch" autocomplete="off" oninput="locateOwner($(this).val())">
+                            </div>
+                            <script>
+                                function locateOwner(str) {
+                                    str = str.trim();
+                                    if (str==='')return ;
+                                    $("#id_owner option").attr("selected",false);
+                                    $("#id_owner").find("option:contains("+str+")").eq(0).attr("selected",true);
+                                }
+                            </script>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="parent" class="col-2 col-form-label text-right">父权限</label>
+                        <div class="col-8">
+                            <select name="parent" disabled class="form-control @error('parent') is-invalid @enderror">
+                                <option value="">待开发</option></select>
+                            @error('parent')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="remark" class="col-2 col-form-label text-right">备注</label>
+                        <div class="col-8">
+                            <input type="text" class="form-control @error('remark') is-invalid @enderror"
+                                   name="remark" autocomplete="off" value="{{ old('remark') }}" >
+                            @error('remark')
+                            <span class="invalid-feedback" role="alert">
+                                <strong>{{ $message }}</strong>
+                            </span>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-8 offset-2">
+                            <input type="submit" class="btn btn-success form-control">
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/maintenance/authority/create.blade.php

@@ -17,22 +17,10 @@
                 <form method="POST" action="{{ url('maintenance/authority') }}">
                     @csrf
                     <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">权限名称</label>
-                        <div class="col-8">
-                            <input type="text" class="form-control @error('name') is-invalid @enderror @error('combinedName') is-invalid @enderror"
-                                   name="name" autocomplete="off" value="{{ old('name') }}" placeholder="（唯一）" >
-                            @error('name')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="name" class="col-2 col-form-label text-right">关联货主</label>
+                        <label for="name" class="col-2 col-form-label text-right">货主</label>
                         <div class="col-8">
                             <div class="input-group">
-                                <select name="id_owner" id="id_owner" class="form-control @error('id_owner') is-invalid @enderror @error('combinedName') is-invalid @enderror">
+                                <select name="id_owner" id="id_owner" class="form-control @error('id_owner') is-invalid @enderror @error('name') is-invalid @enderror">
                                     <option value="" {{old("id_owner")==''?"selected":""}}></option>
                                     @foreach($owners as $owner)
                                         <option value="{{$owner->id}}" {{old("id_owner") == $owner->id ? "selected":""}}>{{$owner->name}}</option>
@@ -40,6 +28,16 @@
                                 </select>
                                 <input type="text" class="form-control input-group-prepend" placeholder="输入关键字定位货主名称"
                                        name="locateOwnerSearch" autocomplete="off" oninput="locateOwner($(this).val())">
+                                @error('id_owner')
+                                <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $errors->first('id_owner') }}</strong>
+                                </span>
+                                @enderror
+                                @error('name')
+                                <span class="invalid-feedback" role="alert">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                </span>
+                                @enderror
                             </div>
                             <script>
                                 function locateOwner(str) {
@@ -51,30 +49,6 @@
                             </script>
                         </div>
                     </div>
-                    <div class="form-group row">
-                        <label for="parent" class="col-2 col-form-label text-right">父权限</label>
-                        <div class="col-8">
-                            <select name="parent" disabled class="form-control @error('parent') is-invalid @enderror">
-                                <option value="">待开发</option></select>
-                            @error('parent')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="remark" class="col-2 col-form-label text-right">备注</label>
-                        <div class="col-8">
-                            <input type="text" class="form-control @error('remark') is-invalid @enderror"
-                                   name="remark" autocomplete="off" value="{{ old('remark') }}" >
-                            @error('remark')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
-                        </div>
-                    </div>
                     <div class="form-group row">
                         <div class="col-8 offset-2">
                             <input type="submit" class="btn btn-success form-control">

resources/views/maintenance/authority/menu.blade.php

@@ -6,10 +6,10 @@
             <li class="nav-item">
                 <a class="nav-link" href="{{url('maintenance/authority')}}" :class="{active:isActive('',3)}">查询</a>
             </li> @endcan
-{{--            @can('权限-录入')--}}
-{{--            <li class="nav-item">--}}
-{{--                <a class="nav-link" href="{{url('maintenance/authority/create')}}" :class="{active:isActive('create',3)}">录入</a>--}}
-{{--            </li> @endcan--}}
+            @can('权限-录入')
+            <li class="nav-item">
+                <a class="nav-link" href="{{url('maintenance/authority/create')}}" :class="{active:isActive('create',3)}">录入货主</a>
+            </li> @endcan
             {{$slot}}
         </ul>
     </div>

resources/views/process/index.blade.php

@@ -755,6 +755,7 @@
                 },
                 //取消录入参与人
                 deleteProcessDailyParticipant($event,daily_id,processDailyParticipant_name,isConfirmBtn){
+                    console.log($event,daily_id,processDailyParticipant_name,isConfirmBtn);
                     if (!isConfirmBtn) {
                         this.processDailyParticipants.every(function (processDailyParticipant) {
                             if(processDailyParticipant.daily_id==daily_id){
@@ -767,7 +768,8 @@
                     let _this=this;
                     this.processDailyParticipants.every(function (processDailyParticipant,i) {
                         if(processDailyParticipant.daily_id==daily_id){
-                            if (!processDailyParticipant_name&&_this.processDailyParticipants[i+1].daily_id)return false;
+                            if (!processDailyParticipant_name&&_this.processDailyParticipants[i+1]&&_this.processDailyParticipants[i+1].daily_id)return false;
+                            if (!_this.processDailyParticipants[i+1])return false;
                             _this.processDailyParticipants[i+1].rowspan=(processDailyParticipant.rowspan)-1;
                             _this.processDailyParticipants[i+1].daily_id=processDailyParticipant.daily_id;
                             _this.processDailyParticipants[i+1].date=processDailyParticipant.date;

resources/views/rejected/create.blade.php

@@ -174,6 +174,7 @@
                                             <option value="0">否</option>
                                             <option value="1">是</option>
                                             <option value="null">无需入库</option>
+                                            <option value="3">上传异常</option>
                                         </select>
                                         <span class="invalid-feedback" v-if="errors.is_loaded"><strong>@{{errors.is_loaded[0]}}</strong></span>
                                     </div>
@@ -716,7 +717,11 @@
                         _this.cleanError();
                         tempTip.cancelWaitingTip();
                         if(response&&response.data&&response.data.success!=='false'){
-                            if(typeof(response.data.bill_is_loaded)!='undefined'){
+                            if(response.data.success=='exception'){
+                                    _this.status.lockingIsLoadedInput=true;
+                                    _this.billInputting.is_loaded=3;
+                                    tempTip.show('富勒入库异常，请手动校对');
+                            }else if(typeof(response.data.bill_is_loaded)!='undefined'){
                                 if(response.data.bill_is_loaded===true){
                                     _this.status.editingBill.is_loaded=1;
                                     _this.billInputting.is_loaded=1;

resources/views/rejected/index.blade.php

@@ -130,6 +130,7 @@
                                         <option value="0">否</option>
                                         <option value="null">无需入库</option>
                                         <option value="2">待推单</option>
+                                        <option value="4">待确认</option>
                                     </select>
                                 </td>
                                 <td></td>
@@ -240,12 +241,17 @@
                             <span v-if="rejectedBill.is_checked==1" class="text-success">
                                 <span class="fa fa-check-square"></span> @{{ rejectedBill.checked_numbers }}
                             </span>
-                            <span v-else class="text-muted">
+                            <span v-else>
                                 未审核
                             </span>
                         </td>
                         <td class="" :class="[rejectedBill.is_finished!=0?'text-success':'text-muted']">@{{rejectedBill.is_finished | yesNo}}</td>
-                        <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">@{{rejectedBill.is_loaded | yesNoIsLoaded}}</td>
+                        <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">
+                            <span v-if="rejectedBill.is_loaded==4">
+                                <button class="btn btn-sm btn-info" @click="confirmBeStored($event,rejectedBill.id)">确定入库</button>
+                            </span>
+                            <span v-else>@{{rejectedBill.is_loaded | yesNoIsLoaded}}</span>
+                        </td>
                         <td class="text-muted">@{{rejectedBill.created_at}}</td>
                         <td>@{{rejectedBill.owner.name}}</td>
                         <td>@{{rejectedBill.logistic_number_return}}</td>
@@ -334,6 +340,7 @@
         let total='{{$rejectedBills->total()}}';
         let editUrl = "{{url('rejectedBill')}}/";
         let destroyUrl = "{{url('rejectedBill')}}/";
+        let ajaxConfirmBeStoredUrl = '{{url("apiLocal/rejectedBill/apiConfirmBeStored")}}';
         let ajaxCheckUrl = '{{url("apiLocal/rejectedBill/apiSetIsLoadedAll")}}';
         let ajaxCheckAllURL = '{{url("rejected/ajaxCheckAll")}}';
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
@@ -341,5 +348,5 @@
         let exportExcelOnFilterParamsURL='{{url("rejected/exportExcelOnFilterParams")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/singles/rejectedIndex200310.js')}}"></script>
+    <script src="{{asset('js/singles/rejectedIndex200424.js')}}"></script>
 @endsection

resources/views/waybill/edit.blade.php

@@ -4,7 +4,7 @@
     <div id="nav2">
         @component('waybill.menu')
             <li class="nav-item">
-                <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',3)}">调度</a>
+                <a class="nav-link" href="{{URL::current()}}" :class="{active:isActive('edit',4)}">调度</a>
             </li>
         @endcomponent
     </div>
@@ -321,6 +321,16 @@
                 errors:[],
             },
             mounted:function(){
+                    if (!this.waybillPriceModel.origination_city_id){
+                        let _this=this;
+                        this.cities.every(function (city) {
+                            if (city.name=="上海"){
+                                _this.waybillPriceModel.origination_city_id=city.id;
+                                return false;
+                            }
+                            return  true;
+                        });
+                    }
                 /*将地址转换为市区，赋给data*/
                     if (!this.waybillPriceModel.origination_city_id){
                         let origination=document.getElementById('origination_seek').value;

routes/api/thirdPart/flux.php

@@ -20,3 +20,9 @@ Route::post('package/new', "PackageController@new_");//增加新波次消息
 */
 //请求数据，查询库单据是否存在
 Route::post('process/getProcessContent', "ProcessController@getProcessContent");//增加新波次消息
+
+/*
+文件地址前缀：/api/thirdPart/flux/waybill
+*/
+//请求数据，查询库单据是否存在
+Route::post('waybill/new', "WaybillController@new_");//增加运输单消息

routes/apiLocal.php

@@ -16,6 +16,7 @@ Route::post('rejectedBill/store', 'RejectedBillController@apiStore');
 Route::post('rejectedBill/update', 'RejectedBillController@apiUpdate');
 Route::post('rejectedBill/apiGetRecent', 'RejectedBillController@apiGetRecent');
 Route::post('rejectedBill/apiSetIsLoadedAll', 'RejectedBillController@apiSetIsLoadedAll');
+Route::post('rejectedBill/apiConfirmBeStored', 'RejectedBillController@apiConfirmBeStored');
 
 Route::post('logistic/numberFeatures/computeLogisticByNumber', 'LogisticNumberFeatureController@apiComputeLogisticByNumber');
 Route::post('logistic/logisticNumberReturnIsUnique', 'RejectedBillController@apiLogisticNumberReturnIsUnique');

tests/waybill_flux.http

@@ -0,0 +1,4 @@
+POST https://was.baoshi56.com/api/thirdPart/flux/waybill/new
+Content-Type: application/json
+
+{"request":[{"OrderNo":"SO20050600005","CustomerID":"WANLING","CarrierID":"BSZXDF","ConsigneeName":"MOB186****0626","C_Tel1":"","C_Address1":"四川省 眉山市 洪雅县 洪川镇洪雅县政府","C_Province":"四川省","C_City":"眉山市","C_District":"洪雅县","ReservedField01":"","ReservedField02":"","ReservedField03":"","ReservedField04":"","ReservedField05":"","order_list":[{"SKU_Descr_c":"测试商品","SKU":"TEST025","Alternate_sku1":"TEST025","Qtyordered_each":"1","Cubic":"0","GrossWeight":"0","NetWeight":"0","ReservedField01":"","ReservedField02":"","ReservedField03":"","ReservedField04":"","ReservedField05":""}]}]}