BUG修复：设定终止日期有BUG

订单的条件中混入了addtime
运输系统中调度时的城市定位，会报错且不能定位搜索
运输录入找不到页面

app/Http/Controllers/OrderController.php

@@ -14,7 +14,7 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class OrderController extends Controller
 {
-    private function preciseQuery($request,$sql){
+    private function preciseQuery(Request $request,$sql){
         $orderdate_start=$request->input('orderdate_start');
         $orderdate_end=$request->input('orderdate_end');
         $ordertime_start=$request->input('ordertime_start');
@@ -63,7 +63,7 @@ class OrderController extends Controller
         if ($notes){
             if ($addtime&&$addtime!=0)$sql.=" and addtime >= '".date('Y-m-d H:i:s',strtotime("-".$addtime." day"))."'";
             $sql.=" and notes like '%".$notes."%'";
-        }
+        }else unset($request->input()['addtime']);
         if ($soreference5){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
             if (count($arr)>0){

app/Http/Controllers/ProcessController.php

@@ -214,7 +214,8 @@ class ProcessController extends Controller
         }
         $processDailyOne=$processDailies[count($processDailies)-1];
         $startDate=Carbon::parse($processDailyOne->date);
-        $diffDay=$startDate->diffInDays($today,true);
+        $diffDay=$startDate->diffInDays($today,false);
+        if ($diffDay<1)return true;
         $remain=$processDailyOne->remain;
         $processId=$processDailyOne->process_id;
         for ($i=1;$i<=$diffDay;$i++){
@@ -648,15 +649,13 @@ class ProcessController extends Controller
         }
         if (isset($signMap[$msg]))return ['success'=>false,'data'=>'该单已被确认过！'];
         if (isset($signMap['二次加工组确认'])){
-            $result=$this->statistic($process);
-            //if (!$result['success'])return $result;
+            $this->statistic($process);
             $process->createSign('财务确认');
             $process->destroySign();
             return ['success'=>true,'data'=>false];
         }
         if (isset($signMap['财务确认'])){
-            $result=$this->statistic($process);
-            //if (!$result['success'])return $result;
+            $this->statistic($process);
             $process->createSign('二次加工组确认');
             $process->destroySign();
             return ['success'=>true,'data'=>false];
@@ -862,7 +861,7 @@ class ProcessController extends Controller
         $process_id=$request->process_id;
         if (!$start_date || !$process_id)return ['success'=>false,'data'=>'起始日期为空或单据已不存在！'];
         $processDailiesId=[];
-        $processDailies=ProcessDaily::where('process_id',$process_id)->get();
+        $processDailies=ProcessDaily::where('process_id',$process_id)->orderBy('date','DESC')->get();
         $is_process_daily=false;
         foreach ($processDailies as $processDaily){
             if ($processDaily->date == $start_date){
@@ -899,7 +898,7 @@ class ProcessController extends Controller
         $process_id=$request->process_id;
         if (!$end_date || !$process_id)return ['success'=>false,'data'=>'终止日期为空或单据已不存在！'];
         $processDailiesId=[];
-        $processDailies=ProcessDaily::where('process_id',$process_id)->get();
+        $processDailies=ProcessDaily::where('process_id',$process_id)->orderBy('date','DESC')->get();
         foreach ($processDailies as $processDaily){
             if (Carbon::parse($processDaily->date)->gt(Carbon::parse($end_date))){
                 array_push($processDailiesId,$processDaily->id);

app/Http/Controllers/WaybillsController.php

@@ -123,23 +123,14 @@ class WaybillsController extends Controller
     }
 
 
-    public function create()
+    public function create(Request $request)
     {
         if(!Gate::allows('运输管理-录入')){ return redirect(url('/'));  }
         $owners=Owner::get();
-        return view('waybill.create',['owners'=>$owners]);
-    }
-    public function createZF()
-    {
-        if(!Gate::allows('运输管理-录入')){ return redirect(url('/'));  }
-        $owners=Owner::get();
-        return view('waybill.create',['owners'=>$owners,'type'=>'直发车']);
-    }
-    public function createZX()
-    {
-        if(!Gate::allows('运输管理-录入')){ return redirect(url('/'));  }
-        $owners=Owner::get();
-        return view('waybill.create',['owners'=>$owners,'type'=>'专线']);
+        $type="";
+        if ($request->type==='ZF')$type='直发车';
+        if ($request->type==='ZX')$type='专线';
+        return view('waybill.create',['owners'=>$owners,'type'=>$type]);
     }
 
     public function store(Request $request)

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

@@ -46,6 +46,7 @@
                                 <div class="form-inline">
                                     <input style="max-width: 200px" name="notes" title="右侧选择查询范围，默认为一天内" v-model="filterData.notes" class="form-control form-control-sm tooltipTarget" placeholder="备注" autocomplete="off" :class="filterData.notes?'bg-warning':''">
                                     <select style="max-width: 100px" title="查询范围，范围越短搜索越快"  name="addtime" v-model="filterData.addtime" class="form-control form-control-sm tooltipTarget">
+                                        <option value="1">一天内</option>
                                         <option value="31">近一月</option>
                                         <option value="92">近三月</option>
                                         <option value="183">近半年</option>
@@ -255,7 +256,7 @@
             data:{
                 filterData:{
                     paginate:50,ordertime_start:'',orderdate_start:'',orderdate_end:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',codename_c:'',
-                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'31',alternate_sku1:'',waveno:'',edisendflag2:'',
+                    carriername:'',issuepartyname:'',soreference1:'',notes:'',addtime:'1',alternate_sku1:'',waveno:'',edisendflag2:'',
                 },
                 page:Number('{{$page}}'),
                 maxPage:1,
@@ -356,8 +357,10 @@
                     if (this.filterData.carriername)url+="&carriername="+this.filterData.carriername;
                     if (this.filterData.soreference1)url+="&soreference1="+this.filterData.soreference1;
                     if (this.filterData.issuepartyname)url+="&issuepartyname="+this.filterData.issuepartyname;
-                    if (this.filterData.notes)url+="&notes="+this.filterData.notes;
-                    if (this.filterData.addtime)url+="&addtime="+this.filterData.addtime;
+                    if (this.filterData.notes){
+                        url+="&notes="+this.filterData.notes;
+                        if (this.filterData.addtime)url+="&addtime="+this.filterData.addtime;
+                    }
                     if (this.filterData.alternate_sku1)url+="&alternate_sku1="+this.filterData.alternate_sku1;
                     if (this.filterData.waveno)url+="&waveno="+this.filterData.waveno;
                     if (this.filterData.edisendflag2) url+="&edisendflag2="+this.filterData.edisendflag2;

resources/views/waybill/create.blade.php

@@ -8,10 +8,10 @@
                 <ul class="nav nav-pills">
                     @can('运输管理-录入')
                         <li class="nav-item">
-                            <a class="nav-link" href="{{url('waybill/create/ZX')}}" :class="{active:isActive('ZX',3)}">专线</a>
+                            <a class="nav-link @if($type=='专线') active @endif" href="{{url('waybill/create?type=ZX')}}" >专线</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="{{url('waybill/create/ZF')}}" :class="{active:isActive('ZF',3)}">直发车</a>
+                            <a class="nav-link @if($type=='直发车') active @endif" href="{{url('waybill/create?type=ZF')}}">直发车</a>
                         </li> @endcan
                 </ul>
             </div>
@@ -25,8 +25,8 @@
                     <input name="type" hidden value="{{$type}}">
                     <div class="h5 text-center mb-3">
                         <ul class="nav nav-tabs">
-                            <li class="nav-item offset-5"><a class="nav-link @if($type=='专线') active @endif" href="{{url('waybill/create/ZX')}}">专线</a></li>
-                            <li class="nav-item"><a class="nav-link @if($type!='专线') active @endif" href="{{url('waybill/create/ZF')}}">直发车</a></li>
+                            <li class="nav-item offset-5"><a class="nav-link @if($type=='专线') active @endif" href="{{url('waybill/create?type=ZX')}}">专线</a></li>
+                            <li class="nav-item"><a class="nav-link @if($type!='专线') active @endif" href="{{url('waybill/create?type=ZF')}}">直发车</a></li>
                         </ul>
                     </div>
                     <div class="form-group row">

resources/views/waybill/edit.blade.php

@@ -573,11 +573,11 @@
                 origination_city_name:function (e) {
                     let _this=this;
                     let $val=e.target.value;
-                    if($val==='')_this.waybillPriceModel.origination_city_id='';
+                    if($val==='')_this.waybill.origination_city_id='';
                     else
                         _this.cities.forEach(function (city) {
                             if (city.name.includes($val)){
-                                _this.waybillPriceModel.origination_city_id=city.id;
+                                _this.waybill.origination_city_id=city.id;
                             }
                         });
                 },
@@ -585,11 +585,11 @@
                 destination_city_id:function (e) {
                     let _this=this;
                     let $val=e.target.value;
-                    if($val==='')_this.waybillPriceModel.destination_city_id='';
+                    if($val==='')_this.waybill.destination_city_id='';
                     else
                         _this.cities.forEach(function (city) {
                             if (city.name.includes($val)){
-                                _this.waybillPriceModel.destination_city_id=city.id;
+                                _this.waybill.destination_city_id=city.id;
                             }
                         });
                 },
@@ -606,7 +606,7 @@
                                     return ;
                                 }
                                 _this.cities.push(response.data);
-                                _this.waybillPriceModel.destination_city_id=response.data.id;
+                                _this.waybill.destination_city_id=response.data.id;
                             }).catch(function (err) {
                             tempTip.setDuration(3000);
                             tempTip.show("网络错误！"+err);

resources/views/waybill/menu.blade.php

@@ -8,7 +8,7 @@
             </li> @endcan
             @can('运输管理-录入')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('waybill/create/ZX')}}" :class="{active:isActive('create',2)}">录入</a>
+                <a class="nav-link" href="{{url('waybill/create?type=ZF')}}" :class="{active:isActive('create',2)}">录入</a>
             </li> @endcan
             @can('运输管理-发运')
             <li class="nav-item">