Merge branch 'Haozi'

app/Http/Controllers/LaborReportController.php

@@ -82,21 +82,21 @@ class LaborReportController extends Controller
         foreach ($laborReports as $laborReport){
             if (!$laborReport->group_user_id){
                 //十分钟之内组长未审核实行软删除
-                $tenMinutesLater=Carbon::parse($laborReport->created_at)->subMinutes(-10)->format('Y-m-d H-i-s');
-                if (Carbon::now()->format('Y-m-d H-i-s')>$tenMinutesLater){
+                $tenMinutesLater=Carbon::parse($laborReport->created_at)->subMinutes(-10)->format('Y-m-d H:i:s');
+                if (Carbon::now()->format('Y-m-d H:i:s')>$tenMinutesLater){
                     $laborReport->delete();
                     $this->log(__METHOD__,"组长未审核该条记录将在10分钟后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
                 }
             }
-            $createdAtDate=Carbon::parse($laborReport->created_at)->format('Y-m-d H');
-            $userDutyCheck=UserDutyCheck::where('checked_at','like',$createdAtDate.'%')->where('user_id',$laborReport->user_id)->where('type','登入')->first();
-            if(!$userDutyCheck)$addOneHourCheckedAt=Carbon::parse($laborReport['created_at'])->subHours(-1)->format('Y-m-d H-i-s');
-            else $addOneHourCheckedAt=Carbon::parse($userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H-i-s');
+            $createdAtDate=Carbon::parse($laborReport->created_at)->format('Y-m-d H:i');
+            $userDutyCheck=UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登入')->where('checked_at','like',$createdAtDate.'%')->first();
+            if(!$userDutyCheck)$addOneHourCheckedAt=Carbon::parse($laborReport['created_at'])->subHours(-1)->format('Y-m-d H:i:s');
+            else $addOneHourCheckedAt=Carbon::parse($userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H:i:s');
             if ($userDutyCheck['verify_user_id']) $laborReport->userDutyCheck=$userDutyCheck;
-            if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H-i-s')<$addOneHourCheckedAt){
+            if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')<$addOneHourCheckedAt){
                 $laborReport->userDutyCheck=$userDutyCheck;
             }
-            else if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H-i-s')>$addOneHourCheckedAt){
+            else if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')>$addOneHourCheckedAt){
                 $laborReport->delete();
                 $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }

app/Http/Controllers/OrderController.php

@@ -182,7 +182,10 @@ class OrderController extends Controller
     public function freezeAll(Request $request){
         if(!Gate::allows('订单管理-编辑')){ return redirect(url('/'));  }
         $checkData=$request->input('checkData')??'';
-        $orders=OracleDOCOrderHeader::whereIn('orderno',$checkData)->get();
+        //冻结条件只局限于 分配完成sostatus=40  创建订单sostatus=00  拣货完成sostatus=60  播种完成sostatus=61
+        $sostatus=['40','00','60','61'];
+        $orders=OracleDOCOrderHeader::select('OrderNo','SoStatus')->whereIn('orderno',$checkData)->whereIn('SoStatus',$sostatus)->get();
+        if(count($checkData)!=count($orders))return ['success'=>false,'fail_info'=>"勾选订单有不可冻结订单"];
         foreach ($orders as $order){
             $is_freeze=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['releasestatus'=>'H','waveno'=>'*']);
             $this->log(__METHOD__,'批量冻结修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
@@ -191,7 +194,7 @@ class OrderController extends Controller
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
                 $this->log(__METHOD__,'批量冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
-            if (!$is_freeze)return ['success'=>'false','fail_info'=>"数据 {$order['orderno']} 更新失败"];
+            if (!$is_freeze)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];
     }
@@ -199,11 +202,13 @@ class OrderController extends Controller
     public function deAllocationAll(Request $request){
         if(!Gate::allows('订单管理-编辑')){ return redirect(url('/'));  }
         $checkData=$request->input('checkData')??'';
+        //取消分配条件只局限于 分配完成sostatus=40 和 部分分配sostatus=30
         $sostatus=['30','40'];
 //        $orders=OracleDOCOrderHeader::select('OrderNo','SoStatus')->whereIn('orderno',$checkData)->where(function($query){
 //            $query->orWhere('SoStatus','30')->orWhere('SoStatus','40');
 //        })->toSql();
         $orders=OracleDOCOrderHeader::select('OrderNo','SoStatus')->whereIn('orderno',$checkData)->whereIn('SoStatus',$sostatus)->get();
+        if(count($checkData)!=count($orders))return ['success'=>false,'fail_info'=>"勾选订单有不可取消分配订单"];
         foreach ($orders as $order){
             $is_deAllocation=$this->isDeAllocation($order->orderno);
             $deAllocation=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['sostatus'=>'00','waveno'=>'*']);
@@ -213,7 +218,7 @@ class OrderController extends Controller
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
                 $this->log(__METHOD__,'批量取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
-            if (!$is_deAllocation||!$deAllocation)return ['success'=>'false','fail_info'=>"数据 {$order['orderno']} 更新失败"];
+            if (!$is_deAllocation||!$deAllocation)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];
     }

app/Http/Controllers/WaybillsController.php

@@ -681,6 +681,9 @@ class WaybillsController extends Controller
             'carrier_weight'=>'承运商计数(抛)',
             'warehouse_weight_other'=>'仓库计重',
             'carrier_weight_other'=>'承运商计重',
+            'carType'=>'车型',
+            'car_owner_info'=>'车辆信息',
+            'mileage'=>'里程数',
             'fee'=>'运费(元)',
             'pick_up_fee'=>'提货费(元)',
             'other_fee'=>'其他费用(元)',
@@ -733,8 +736,9 @@ class WaybillsController extends Controller
                 'warehouse_weight_other'=>isset($waybill->warehouse_weight_other)?$waybill->warehouse_weight_other.' '.(isset($waybill->warehouse_weight_unit_other_name)?$waybill->warehouse_weight_unit_other_name:''):'',
                 'carrier_weight'=>isset($waybill->carrier_weight)?$waybill->carrier_weight.' '.(isset($waybill->carrier_weight_unit_name)?$waybill->carrier_weight_unit_name:''):'',
                 'carrier_weight_other'=>isset($waybill->carrier_weight_other)?$waybill->carrier_weight_other.' '.(isset($waybill->carrier_weight_unit_other_name)?$waybill->carrier_weight_unit_other_name:''):'',
-                //'carType'=>isset($waybill->carType->name)?$waybill->carType->name.($waybill->carType->length.'米'):'',
-                //'car_owner_info'=>isset($waybill->car_owner_info)?$waybill->car_owner_info:'',
+                'carType'=>isset($waybill->carType->name)?$waybill->carType->name.($waybill->carType->length.'米'):'',
+                'car_owner_info'=>isset($waybill->car_owner_info)?$waybill->car_owner_info:'',
+                'mileage'=>isset($waybill->mileage)?$waybill->mileage:'',
                 'fee'=>isset($waybill->fee)?$waybill->fee:'',
                 'pick_up_fee'=>isset($waybill->pick_up_fee)?$waybill->pick_up_fee:'',
                 'other_fee'=>isset($waybill->other_fee)?$waybill->other_fee:'',

database/migrations/2020_07_14_104613_add_waybills_deliver_at.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddWaybillsDeliverAt extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('waybills',function (Blueprint $table){
+            $table->timestamp('deliver_at')->nullable()->comment('发货时间');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('waybills', function (Blueprint $table) {
+            $table->dropColumn('deliver_at');
+        });
+    }
+}

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

@@ -112,9 +112,9 @@
                         </span>
                                 @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
                                 @can('订单管理-编辑')
-                                    <span class="btn btn-sm" @click="freezeAll" style="cursor: pointer"
+                                    <span class="btn btn-sm tooltipTarget" @click="freezeAll" style="cursor: pointer" title="订单的冻结条件要只局限在“创建订单”,“分配完成”,“拣货完成”,“播种完成”"
                                           :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">冻结</span>
-                                    <span class="btn btn-sm" @click="deAllocationAll" style="cursor: pointer"
+                                    <span class="btn btn-sm tooltipTarget" @click="deAllocationAll" style="cursor: pointer"  title="订单的取消分配条件要只局限在“分配完成”或“部分分配”"
                                           :class="[checkData.length>0?'btn-dark':'btn-outline-dark']">取消分配</span>
                                 @endcan
                             </td>
@@ -447,7 +447,7 @@
                             tempTip.showSuccess('标记勾选内容为冻结成功');
                         }else{
                             tempTip.setDuration(2500);
-                            tempTip.show('标记勾选内容为冻结失败，错误：'+response.data.fail_info);
+                            tempTip.show('标记勾选内容冻结失败，错误：'+response.data.fail_info);
                         }
                     }).catch(function (e) {
                         alert('网络连接错误：'+e);