Merge branch 'master' into zengjun

app/Console/Kernel.php

@@ -59,10 +59,10 @@ class Kernel extends ConsoleKernel
         $schedule->command('syncLogCacheTask')->everyMinute();
         $schedule->command('createOwnerReport')->monthlyOn(1);
         $schedule->command('createOwnerBillReport')->monthlyOn(1);
-        $schedule->command('createOwnerAreaReport')->monthlyOn(25);
+        $schedule->command('createOwnerAreaReport')->monthlyOn(1);
         $schedule->command('sync:batch')->everyMinute();
         $schedule->command('sync:order')->everyMinute();
-        $schedule->command('syncOrderPackageLogisticRouteTask')->dailyAt('12:50')();//同步快递信息到orderPackage
+        $schedule->command('syncOrderPackageLogisticRouteTask')->dailyAt('1:20')();//同步快递信息到orderPackage
         $schedule->command('SyncWmsCommoditiesInformation')->everyMinute();
         $schedule->command('clear:cancelledOrder')->everyTenMinutes();
         $schedule->command('WasSyncWmsAsnInformation')->everyMinute();

app/Http/Controllers/TestController.php

@@ -21,6 +21,7 @@ use App\Http\Requests\ForeignHaiRobotic_taskUpdateRequest;
 use App\Http\Requests\TestAaRequest;
 use App\Imports\OrderTrackingImport;
 use App\InventoryAccount;
+use App\Jobs\OrderFreeze;
 use App\LaborReport;
 use App\Log;
 use App\Logistic;
@@ -166,90 +167,11 @@ sql;
             }
         });
     }
-    protected $params;
-    protected $pool;
-    public function zzd()
-    {
-        $this->params = [
-            [
-                "code"  => "test1",
-                "logistic_id" => "4",
-                "province" => "宁夏自治区",
-                "city" => "石嘴山市",
-                "district" => "花都区",
-                "wms_status" => "创建订单",
-            ],
-            [
-                "code"  => "test2",
-                "logistic_id" => "4",
-                "province" => "宁夏自治区",
-                "city" => "石嘴山市",
-                "district" => "花都区",
-                "wms_status" => "订单完成",
-            ],
-            [
-                "code"  => "test3",
-                "logistic_id" => "2",
-                "province" => "宁夏自治区",
-                "city" => "石嘴山市",
-                "district" => "花都区",
-                "wms_status" => "创建订单",
-            ],
-            [
-                "code"  => "test4",
-                "logistic_id" => "2",
-                "province" => "宁夏自治区",
-                "city" => "",
-                "district" => "",
-                "wms_status" => "创建订单",
-            ]
-        ];
-        if (!$this->params)return;
-        $this->pool = app("OrderFreezeService")->getFreezes();
-        if (isset($this->params[0][0]))$this->processUpdate();
-        $this->processCreate();
-    }
-    protected function processUpdate()
-    {
-        unset($this->params[0]);
-    }
-
-    protected function processCreate()
-    {
-        $freezeOrders = [];
-        foreach ($this->params as $param){
-            if (!$param["logistic_id"])continue;
-            if ($this->isFreeze($param))$freezeOrders[] = $param["code"];
-        }
-        $this->pushWMS($freezeOrders);
-    }
-
-    private function isFreeze($param)
-    {
-        $status = ['分配完成','创建订单','拣货完成','播种完成'];
-        if (array_search($param["wms_status"],$status)===false)return false;
-
-        foreach ($this->pool as $pool){
-            if ($pool["logistic_id"]!=$param["logistic_id"])continue;
-            if ($pool["province_name"] && (mb_strpos($param["province"],$pool["province_name"]) === false))continue;
-            if ($pool["city_name"] && (mb_strpos($param["city"],$pool["city_name"]) === false))continue;
-            if ($pool["location_name"] && (mb_strpos($param["district"],$pool["location_name"]) === false))continue;
-            return true;
-        }
-        return false;
-    }
 
-    private function pushWMS($freezeOrders)
+    public function zzd()
     {
-        if (!$freezeOrders)return;
-        $where = "''";
-        foreach ($freezeOrders as $f)$where .= ",'{$f}'";
-        $sql = <<<sql
-UPDATE DOC_ORDER_HEADER SET releasestatus = 'H',waveno='*',notes = CASE WHEN notes IS NULL THEN '停运' ELSE  notes||',停运' END where ORDERNO in ({$where})
-sql;
-        dd($freezeOrders,$sql);
-        LogService::log(__METHOD__,"订单同步-自动冻结",$sql);
-        DB::connection("oracle")->update($sql);
+        dd(storage_path('app\\'."156168818641.jpg"));
+        return view("test");
     }
 
     public function mergeCarrier()

config/api_logistic.php

@@ -106,5 +106,5 @@ return [
         'x-appKey' => 'c51c718eb899e9f706979',
         'x-dataDigest' => '9f664e3ab08049874aa417720840161a',
     ],
-    'init_date' => '2021-01-18 23:59:59',
+    'init_date' => '2021-01-17 23:59:59',
 ];

database/migrations/2021_01_19_151928_fix_order_package_status.php

@@ -0,0 +1,29 @@
+<?php
+
+use App\OrderPackage;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FixOrderPackageStatus extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        OrderPackage::query()->whereNotNull('weighed_at')->update(['status'=>'已称重']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

resources/sass/text.scss

@@ -127,4 +127,9 @@
 .text-wrap{
     white-space: normal;
     word-break:break-all
+}
+
+//文本强调阴影
+.text-shadow-stress{
+    text-shadow: 3px 3px 3px yellow
 }

resources/views/customer/project/create.blade.php

@@ -198,6 +198,7 @@
                 selectedResult:"",
                 searchItem:{},//搜索子项集
                 searchBase:5,//搜索基数
+                hover:{},
             },
             mounted(){
                 this.ownerTemp = JSON.parse(JSON.stringify(this.owner));
@@ -205,6 +206,10 @@
                 $("#container").removeClass("d-none");
             },
             methods:{
+                //悬浮效果
+                hoverEffect(key,val){
+                    this.$set(this.hover,key,val);
+                },
                 //收起展开
                 show(id){
                     if (this.upList[id])$("#"+id).slideDown();
@@ -468,6 +473,7 @@
                     if (!this.pool.logistics)this._getLogistics();
                 },
                 _setModelData(key,val){
+                    if (!val)return;
                     let mapping = [];
                     val.forEach(item=>{
                         mapping[item.id] = item.name;
@@ -508,7 +514,7 @@
                 //获取车型
                 _getCars(){
                     let url = "{{url('maintenance/carType/get')}}";
-                    window.axios.post(url).then(res=>{this._setModelData("cars",res);});
+                    window.axios.post(url).then(res=>{this._setModelData("cars",res.data);});
                 },
                 //保存模型
                 saveModel(){

resources/views/customer/project/part/_directLogistic.blade.php

@@ -21,7 +21,7 @@
         <div class="w-100 form-inline">
             <input id="directLogisticFile" type="file" class="d-none" accept=".csv, .xlsx, .xls" @change="importDirectLogistic($event)"/>
             <button type="button" class="btn btn-sm btn-outline-info w-25" @click="addDirectLogisticItem()">新增</button>
-            <button type="button" class="btn btn-sm btn-outline-primary w-25 ml-2" @click="selectFile('directLogisticFile')">导入</button>
+            <button type="button" class="btn btn-sm btn-outline-primary w-25 ml-2" @click="selectFile('directLogisticFile')" @mouseenter="hoverEffect('directLogistic',true)" @mouseleave="hoverEffect('directLogistic',false)">导入</button>
             <h5><span class="ml-0 fa fa-question-circle-o cursor-pointer" data-toggle="tooltip" data-placement="top" title="导入与保存时自动过滤重复数据"></span></h5>
         </div>
         <div class="w-100 mt-1 ml-1" v-if="model.directLogistic.items.length>searchBase">
@@ -38,7 +38,8 @@
                 </div>
             </div>
         </div>
-        <div class="row font-weight-bold" v-if="model.directLogistic.items.length>0">
+        <div class="row font-weight-bold" v-if="model.directLogistic.items.length>0 || hover.directLogistic"
+             :class="hover.directLogistic ? 'text-danger font-weight-bold text-shadow-stress' : ''">
             <label class="col-3">车型</label>
             <label class="col-3">起步费</label>
             <label class="col-4">续费(元/KM)</label>

resources/views/customer/project/part/_express.blade.php

@@ -27,7 +27,7 @@
         <div class="w-100 form-inline">
             <input id="expressFile" type="file" class="d-none" accept=".csv, .xlsx, .xls" @change="importExpress($event)"/>
             <button type="button" class="btn btn-sm btn-outline-info w-25" @click="addExpressItem()">新增</button>
-            <button type="button" class="btn btn-sm btn-outline-primary w-25 ml-2" @click="selectFile('expressFile')">导入</button>
+            <button type="button" class="btn btn-sm btn-outline-primary w-25 ml-2" @click="selectFile('expressFile')" @mouseenter="hoverEffect('express',true)" @mouseleave="hoverEffect('express',false)">导入</button>
             <h5><span class="ml-0 fa fa-question-circle-o cursor-pointer" data-toggle="tooltip" data-placement="top" title="导入与保存时自动过滤重复数据"></span></h5>
         </div>
         <div class="w-100 mt-1 ml-1" v-if="model.express.items.length>searchBase">
@@ -44,7 +44,8 @@
                 </div>
             </div>
         </div>
-        <div class="row font-weight-bold" v-if="model.express.items.length>0">
+        <div class="row font-weight-bold" v-if="model.express.items.length>0 || hover.express"
+             :class="hover.express ? 'text-danger font-weight-bold text-shadow-stress' : ''">
             <label class="col-3">省</label>
             <label class="col-3">首重价格</label>
             <label class="col-3">续重价格</label>

resources/views/test.blade.php

@@ -10,27 +10,23 @@
         </div>
         <div class="row mt-2">
             <div class="col-10">
-                <div class="row m-0" id="row">
-                    <div class="col-6">
-                        <div class="rounded p-0" id="video-1" onclick="selected(this)">
-                            测试测试
-                            <div class="rounded w-100" controls style="min-height: 500px;object-fit: fill" src="{{asset("123.mp4")}}"></div>
-                        </div>
-                    </div>
-                    <div class="col-6">
-                        <div class="rounded p-0" id="video-2" onclick="selected(this)">
-                            <video class="rounded w-100" controls style="min-height: 500px;object-fit: fill" src="{{asset("123.mp4")}}"></video>
+                <div class="row m-0" id="row" onclick="  (this)">
+                    <div class="col-6" id="vi1">
+                        <div id="asd">
+                            <video src="#"></video>
                         </div>
                     </div>
+                    <canvas class="col-6" id="video1" onclick="selected(this)"></canvas>
                 </div>
             </div>
             <div class="col-2 border-left border-3 border-primary text-center">
-                <button class="btn btn-danger" type="button" id="imgPool"></button>
+                <button class="btn btn-danger" type="button" id="imgPool">离 开 云 诊 室</button>
             </div>
         </div>
     </div>
 
     <script>
+
         let currentDom = "";
         let hidden = false;
         function selected(e){
@@ -42,15 +38,14 @@
         document.onkeydown = function(ev) {
             if(ev.keyCode === 32 && currentDom) {
                 ev.preventDefault();
-                html2canvas(document.getElementById(currentDom)).then(canvas=> {
-                    let base64 = canvas.toDataURL('images/png');
-                    let imgPool = $("#imgPool");
-                    if (!hidden){
-                        imgPool.after("<button class='btn btn-success mt-2 mb-0' type='button' onclick='uploadImg()'>上 传 截 图</button>");
-                        hidden = true;
-                    }
-                    imgPool.after("<div class='w-100 mt-2 h-auto' ondblclick='removeImg(this)'><img class='img-fluid images' alt='截图' src='"+base64+"'></div>");
-                });
+                $("#row").append('<canvas class="col-6" id="video2" onclick="selected(this)"></canvas>');
+                let base64 = $("#"+currentDom)[0].toDataURL('images/png');
+                let imgPool = $("#imgPool");
+                if (!hidden){
+                    imgPool.after("<button class='btn btn-success mt-2 mb-0' type='button' onclick='uploadImg()'>上 传 截 图</button>");
+                    hidden = true;
+                }
+                imgPool.after("<div class='w-100 mt-2 h-auto' ondblclick='removeImg(this)'><img class='img-fluid images' alt='截图' src='"+base64+"'></div>");
             }
         };
         function removeImg(e) {