自动冻结增加承运商筛选

控制台称重统计表结构建立

app/Http/Controllers/ControlPanelController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Components\AsyncResponse;
 use App\Owner;
 use App\Services\CheckActiveMenuService;
 use App\Services\LaborReportsCountingRecordService;
@@ -10,13 +11,14 @@ use App\Services\RealtimePendingOrdersService;
 use App\Services\UserService;
 use App\User;
 use Carbon\Carbon;
-use DebugBar\DataFormatter\DataFormatter;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 
 class ControlPanelController extends Controller
 {
-
+    use AsyncResponse;
 
     /**
      * ControlPanelController constructor.
@@ -131,4 +133,17 @@ class ControlPanelController extends Controller
             return array_intersect($ownerIds, $permittingOwnerIds);
         });
     }
+
+    public function weightApi()
+    {
+        $ownerIds = app("UserService")->getPermittingOwnerIds(Auth::user());
+        if (!$ownerIds)$this->success();
+
+        $start = request("start");
+        $end   = request("end");
+        
+        //是否包含当天
+        //天 周 月 年
+        //缓存优先级-》缓存失效策略
+    }
 }

app/Http/Controllers/TestController.php

@@ -304,68 +304,6 @@ sql;
         dd($uploaded . '/' . $count);
     }
 
-    function tlog(Request $request)
-    {
-        app('LogService')->log(__METHOD__, 'cczdelme' . __FUNCTION__, json_encode($request->all()), null);
-    }
-
-    function setCache(Request $request)
-    {
-        $today = now();
-        Cache::put('storedTest', $today);
-        return "cacheing:'$today'<script>localStorage.setItem('storedTest','{$today}')</script>";
-    }
-
-    function getCache(Request $request)
-    {
-        $cache = Cache::get('storedTest');
-        return "cacheing get:'$cache'<script>document.write('<br>localStorage:'+localStorage.getItem('storedTest'))</script>";
-    }
-
-    function t1(Request $request)
-    {
-        $times=12345;
-        $start_at = microtime(true);
-        for($i=0;$i<$times;$i++){
-            Cache::put(md5('k_delme'.$i), 'a');
-        }
-        echo microtime(true)-$start_at, '<br>';
-
-        $start_at = microtime(true);
-        for($i=0;$i<$times;$i++){
-            Cache::get(md5('k_delme'.$i));
-        }
-        echo microtime(true)-$start_at, '<br>';
-
-        $start_at = microtime(true);
-        for($i=0;$i<$times;$i++){
-            Cache::pull(md5('k_delme'.$i));
-        }
-        echo microtime(true)-$start_at, '<br>';
-        for($i=0;$i<$times;$i++){
-            Redis::set(md5('k_delme'.$i), 'a');
-        }
-        echo microtime(true)-$start_at, '<br>';
-
-        $start_at = microtime(true);
-        for($i=0;$i<$times;$i++){
-            Redis::get(md5('k_delme'.$i));
-        }
-        echo microtime(true)-$start_at, '<br>';
-
-        $start_at = microtime(true);
-        for($i=0;$i<$times;$i++){
-            Redis::del(md5('k_delme'.$i));
-        }
-        echo microtime(true)-$start_at, '<br>';
-    }
-
-    function packageT(Request $request)
-    {
-        $package = Package::where('created_at', '<', '2020-07-08')->whereNotNull('logistic_number')->first();
-        $package->fetchLogistic();
-    }
-
     function injectJS(Request $request)
     {
         $items = RejectedBillItem::whereHas('rejectedBill', function ($query) {

app/OrderPackageCountingRecord.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+use App\Traits\LogModelChanging;
+
+class OrderPackageCountingRecord extends Model
+{
+    use LogModelChanging;
+
+    protected $fillable=[
+        "targeted_at","owner_id","un_weigh_count","total_count"
+    ];
+    public $timestamps=false;
+
+    public function owner()
+    {   //货主
+        return $this->belongsTo(Owner::class);
+    }
+}

database/migrations/2021_01_08_112003_add_default_mail_event_role.php

@@ -21,7 +21,7 @@ class AddDefaultMailEventRole extends Migration
         $this->role =  Role::query()->firstOrCreate(['name'=>'发送邮件测试']);
         $emailEvent = MailEvent::query()->where('name', '发送默认邮件')->first();
         $emailEvent->roles()->attach($this->role->id);
-        $this->role->users()->attach(\App\User::query()->where('name','yang')->first()->id);
+        /*$this->role->users()->attach(\App\User::query()->where('name','yang')->first()->id);*/
     }
 
     /**

database/migrations/2021_01_25_104626_create_order_package_counting_records_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOrderPackageCountingRecordsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('order_package_counting_records', function (Blueprint $table) {
+            $table->date("targeted_at")->comment("统计日期");
+            $table->bigInteger("owner_id")->comment("货主");
+            $table->integer("un_weigh_count")->default(0)->comment("未称重数量");
+            $table->integer("total_count")->default(0)->comment("总数");
+            $table->index(["targeted_at","owner_id"]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('order_package_counting_records');
+    }
+}

resources/views/control/panel.blade.php

@@ -346,6 +346,16 @@
                     </div>
                 @endcan
             </div>
+            <div class="row my-3">
+                <div class="col-6 card">
+                    <div class="card-header">
+
+                    </div>
+                    <div class="card-body">
+                        <div id="weight"></div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 @endsection
@@ -454,6 +464,7 @@
                 laborReportsCountingRecordsYearShow: false,
                 laborReportsCountingRecordsStart: moment().subtract('1', 'month').format('yyyy-MM-DD'),
                 laborReportsCountingRecordsEnd: moment(new Date()).format('yyyy-MM-DD'),
+                load:{},
             },
             watch:{
                 selectOrderOwners:function(val,oldval){
@@ -843,6 +854,12 @@
                         }
                     });
                 },
+                loadWeightInfo(){
+                    this.$set(this.load,"weight",true);
+                    /*window.tempTip.postBasicRequest("{{url('apiLocal/control/panel/menu/weightApi')}}",{},res=>{
+
+                    });*/
+                },
             }
         });
     </script>

resources/views/order/index/_freezeModal.blade.php

@@ -18,6 +18,9 @@
                             v-model="freeze.logistic_id">
                             <option v-for="logistic in data.logistics" :value="logistic.id">@{{ logistic.name }}</option>
                     </select>
+                    <label class="col-2">
+                        <input class="ml-1 form-control form-control-sm rounded-pill" @input="searchLogistic($event)" placeholder="搜索承运商">
+                    </label>
                     <span class="invalid-feedback mt-0 offset-3" role="alert" v-if="errors.logistic_id">
                         <strong>@{{ errors.logistic_id[0] }}</strong>
                     </span>

resources/views/order/index/freeze.blade.php

@@ -220,6 +220,15 @@
                     this.freeze = obj;
                     this.stop = true;
                 },
+                searchLogistic(e){
+                    let val = e.target.value;
+                    this.data.logistics.some(logistic=>{
+                        if (logistic.name.indexOf(val)!==-1){
+                            this.$set(this.freeze,"logistic_id",logistic.id);
+                            return true;
+                        }
+                    });
+                },
             },
         });
     </script>

routes/apiLocal.php

@@ -107,4 +107,5 @@ Route::group(['prefix'=>'control'],function () {
     Route::post('panel/menu/warehouseCountingRecordsApi','ControlPanelController@warehouseCountingRecordsApi');
     Route::post('panel/menu/laborReportsCountingRecordApi','ControlPanelController@laborReportsCountingRecordApi');
     Route::post('panel/menu/laborReportsUserGroupsCountApi','ControlPanelController@laborReportsUserGroupsCountApi');
+    Route::post('panel/menu/weightApi','ControlPanelController@weightApi');
 });