Merge branch 'zzd'

# Conflicts:
#	app/Http/Controllers/ExitController.php
#	resources/views/layouts/menu.blade.php
#	resources/views/order/index/delivering.blade.php
#	routes/web.php

app/Http/Controllers/ExitController.php

@@ -1,176 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Exports\Export;
-use App\OracleBasCustomer;
-use App\OracleDOCOrderHeader;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
-use Maatwebsite\Excel\Facades\Excel;
-
-class ExitController extends Controller
-{
-    public function conditionQuery(Request $request,$orders){
-        $ordertime_start=$request->input('ordertime_start');
-        $ordertime_end=$request->input('ordertime_end');
-        $customerid=$request->input('customerid');
-        $soreference1=$request->input('soreference1');
-        $soreference5=$request->input('soreference5');
-        if ($ordertime_start){
-            $ordertime_start=$ordertime_start." 00:00:00";
-            $orders=$orders->where('ordertime','>=',$ordertime_start);
-        }
-        if ($ordertime_end){
-            $ordertime_end=$ordertime_end." 23:59:59";
-            $orders=$orders->where('ordertime','<=',$ordertime_end);
-        }
-        if ($customerid)$orders=$orders->where('customerid',$customerid);
-        if ($soreference1)$orders=$orders->where('orderno','like',$soreference1."%");
-        if ($soreference5){
-            $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
-            $orders=$orders->whereIn('soreference5',$arr);
-        }
-        return $orders;
-    }
-    public function forwarding(Request $request){
-        if(!Gate::allows('订单管理-发运')){ return redirect(url('/'));  }
-        $orders=OracleDOCOrderHeader::with(['oracleDOCOrderDetails'=>function($query){
-            return $query->select('DOC_Order_Details.orderno','DOC_Order_Details.CustomerID',
-                'DOC_Order_Details.SKU','DOC_Order_Details.QtyOrdered','DOC_Order_Details.OrderLineNo',
-                'BAS_SKU.Alternate_SKU1','BAS_SKU.Descr_C')
-                ->leftJoin('BAS_SKU',function ($join){
-                    $join->on('DOC_Order_Details.CustomerID','=','BAS_SKU.CustomerID')
-                    ->on('DOC_Order_Details.SKU','=','BAS_SKU.SKU');
-                })->orderBy('OrderLineNo');
-        }])->select('OrderNo','SOStatus','WAREHOUSEID','CustomerID'
-            ,'ConsigneeID','ConsigneeName','C_Tel1','CarrierName','IssuePartyName','WaveNo','SOReference1'
-            ,'soreference5','EDISENDFLAG2','EDISendTime2','Notes','ERPCANCELFLAG','Picking_Print_Flag','EDISENDFLAG'
-            ,'ReleaseStatus','C_Address1','OrderTime');
-        if ($request->input('checkData')){
-            $checkData=explode(',',$request->input('checkData'));
-            $orders=$orders->whereIn('orderno',$checkData)->get();
-            return $this->export($orders);
-        }
-        if ($request->input('export')){
-            $orders=$this->conditionQuery($request,$orders);
-            return $this->export($orders->get());
-        }
-        if ($request->input())$orders=$this->conditionQuery($request,$orders);
-        $orders=$orders->paginate($request->input('paginate')??50);
-        $customers=OracleBasCustomer::select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
-        $request=$request->input();
-        return view('exit/index/forwarding',compact('orders','customers','request'));
-    }
-
-    public function batchComments(Request $request){
-        if(!Gate::allows('订单管理-批量备注')){ return redirect(url('/'));  }
-        $checkData=$request->input('checkData');
-        $content=$request->input('content');
-        $ordersNotNull=OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
-            ->whereNotNull('notes')->get();
-        OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
-            ->whereNull('notes')->update(['notes'=>$content]);
-        $ordersNotNullArr=array_column($ordersNotNull->toArray(),'orderno');
-        $ordersNullArr=array_diff($checkData,$ordersNotNullArr);
-        $data=[];
-        foreach ($ordersNotNull as $order){
-            OracleDOCOrderHeader::where('orderno',$order->orderno)->update(["notes"=>($order->notes).",".$content]);
-            $order->notes=($order->notes).",".$content;
-            array_push($data,$order);
-        }
-        foreach ($ordersNullArr as $order){
-            array_push($data,["orderno"=>$order,'notes'=>$content]);
-        }
-        return $data;
-    }
-
-    function export($orders){
-        if(!Gate::allows('订单管理')){ return redirect(url('/'));  }
-        ini_set('max_execution_time',3500);
-        ini_set('memory_limit','3526M');
-        $row=[[
-            'orderno'=>'编号',
-            'sostatus'=>'订单状态',
-            'warehouseid'=>'仓库',
-            'oracleBASCustomer_descr_c'=>'客户',
-            'consigneeid'=>'收货人',
-            'consigneename'=>'收货人名称',
-            'c_tel1'=>'收货人电话',
-            'carriername'=>'承运人',
-            'issuepartyname'=>'下单方名称',
-            'waveno'=>'波次编号',
-            'soreference1'=>'客户订单号',
-            'soreference5'=>'快递单号',
-            'edisendflag2'=>'快递获取标记',
-            'edisendtime2'=>'快递获取时间',
-            'sku'=>'产品代码',
-            'alternate_sku1'=>'产品条码',
-            'descr_c'=>'产品名称',
-            'qtyordered'=>'订单数量',
-            'notes'=>'备注',
-            'erpcancelflag'=>'接口取消标记',
-            'picking_print_flag'=>'拣货单打印标记',
-            'edisendflag'=>'接口回传标记',
-            'releasestatus'=>'订单冻结标记',
-            'c_address1'=>'收货人地址',
-        ]];
-        $list=[];
-        $sign=[];
-        $mergeCell=[];
-        foreach ($orders as $order){
-            $data=[
-                'orderno'=>$order->orderno,
-                'sostatus'=>$order->oracleBASCode_codename_c,
-                'warehouseid'=>$order->warehouseid,
-                'oracleBASCustomer_descr_c'=>$order->oracleBASCustomer_descr_c,
-                'consigneeid'=>$order->consigneeid,
-                'consigneename'=>$order->consigneename,
-                'c_tel1'=>$order->c_tel1,
-                'carriername'=>$order->carriername,
-                'issuepartyname'=>$order->issuepartyname,
-                'waveno'=>$order->waveno,
-                'soreference1'=>$order->soreference1,
-                'soreference5'=>$order->soreference5,
-                'edisendflag2'=>$order->edisendflag2,
-                'edisendtime2'=>$order->edisendtime2,
-                'notes'=>$order->notes,
-                'erpcancelflag'=>$order->erpcancelflag,
-                'picking_print_flag'=>$order->picking_print_flag,
-                'edisendflag'=>$order->edisendflag,
-                'releasestatus'=>$order->releasestatus,
-                'c_address1'=>$order->c_address1,
-            ];
-            if (count($order->oracleDOCOrderDetails)<1){
-                $data['sku']='';
-                $data['alternate_sku1']='';
-                $data['descr_c']='';
-                $data['qtyordered']='';
-                array_push($list,$data);
-                continue;
-            }
-            foreach ($order->oracleDOCOrderDetails as $oracleDOCOrderDetail){
-                $data['sku']=$oracleDOCOrderDetail->sku;
-                $data['alternate_sku1']=$oracleDOCOrderDetail->alternate_sku1;
-                $data['descr_c']=$oracleDOCOrderDetail->descr_c;
-                $data['qtyordered']=$oracleDOCOrderDetail->qtyordered;
-                if (isset($sign[$order->orderno])){
-                    $data['orderno']='';$data['sostatus']='';$data['warehouseid']='';$data['oracleBASCustomer_descr_c']='';$data['consigneeid']='';$data['consigneename']='';
-                    $data['c_tel1']='';$data['carriername']='';$data['issuepartyname']='';$data['waveno']='';$data['soreference1']='';$data['soreference5']='';
-                    $data['edisendflag2']='';$data['edisendtime2']='';$data['notes']='';$data['erpcancelflag']='';$data['picking_print_flag']='';$data['edisendflag']='';
-                    $data['releasestatus']='';$data['c_address1']='';
-                    array_push($list,$data);
-                    continue;
-                }
-                array_push($list,$data);
-                $sign[$order->orderno]=count($list)+1;
-            }
-            if (count($order->oracleDOCOrderDetails)>1){
-                $mergeCell[$sign[$order->orderno]]=$sign[$order->orderno]+(count($order->oracleDOCOrderDetails)-1);
-            }
-        }
-        $columnName=["A","B","C","D","E","F","G","H","I","J","K","L","M","N","S","T","U","V","W","X"];
-        return Excel::download(new Export($row,$list,$mergeCell,$columnName),date('YmdHis', time()).'-出库发运单.xlsx');
-    }
-
-}

app/Http/Controllers/InventoryController.php

@@ -14,6 +14,7 @@ class InventoryController extends Controller
     public function conditionQuery(Request $request,$page=null,$paginate=null){
         if(!Gate::allows("库存管理-动库报表")){ return redirect(url('/'));  }
 
+
         $date_start=$request->input('date_start');
         if ($request->input('range'))$date_start=date('Y-m-d',strtotime('-'.$request->input('range')." day"));
         $date_end=$request->input('date_end');

app/Http/Controllers/OrderController.php

@@ -0,0 +1,219 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Exports\Export;
+use App\OracleBasCustomer;
+use App\OracleDOCOrderHeader;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Maatwebsite\Excel\Facades\Excel;
+
+class OrderController extends Controller
+{
+    public function delivering(Request $request){
+        if(!Gate::allows('出库管理-发运')){ return redirect(url('/'));  }
+        $paginate=$request->input('paginate')??50;
+        $page=$request->input('page')??1;
+        $ordertime_start=$request->input('ordertime_start');
+        $ordertime_end=$request->input('ordertime_end');
+        $customerid=$request->input('customerid');
+        $orderno=$request->input('orderno');
+        $soreference5=$request->input('soreference5');
+        $checkData=$request->input('checkData');
+        $export=$request->input('export');
+        $sql="select DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
+        ,DOC_ORDER_HEADER.ConsigneeID,DOC_ORDER_HEADER.ConsigneeName,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
+       DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
+        ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
+       DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG
+        ,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,DOC_ORDER_HEADER.OrderTime,DOC_Order_Details.CustomerID,
+       DOC_Order_Details.SKU,DOC_Order_Details.QtyOrdered,DOC_Order_Details.OrderLineNo,BAS_Codes.codename_c,BAS_Customer.descr_c as customer_descr_c,
+       BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C,(select count(*) from DOC_ORDER_HEADER) as counted
+       from (";
+        if (!$request->input('export')&&!$request->input('export'))$sql.=" select * from (";
+        $sql.=" select ROWNUM as rn,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
+                          ,DOC_ORDER_HEADER.ConsigneeID,DOC_ORDER_HEADER.ConsigneeName,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
+                         DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
+                          ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
+                         DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG
+                          ,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,DOC_ORDER_HEADER.OrderTime from DOC_ORDER_HEADER where 1=1";
+        if ($ordertime_start)$sql.=" and ordertime>='".$ordertime_start." 00:00:00'";
+        if ($ordertime_end)$sql.=" and ordertime<='".$ordertime_end." 23:59:59'";
+        if ($customerid)$sql.=" and customerid='".$customerid."'";
+        if ($orderno)$sql.=" and orderno like '".$orderno."%'";
+        if ($soreference5){
+            $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
+            if (count($arr)>0){
+                $sql.=" and soreference5 in (";
+                foreach ($arr as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        }
+        if ($checkData){
+            $checkData=explode(',',$checkData);
+            if (count($checkData)>0){
+                $sql.=" and orderno in (";
+                foreach ($checkData as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        }
+        if (!$request->input('export')&&!$request->input('export'))$sql.=" and ROWNUM<='".$page*$paginate."' order by ordertime desc)";
+        if (!$request->input('export')&&!$request->input('export'))$sql.=" header where header.rn>'".($page-1)*$paginate."' ";
+        $sql.=")DOC_ORDER_HEADER left join DOC_ORDER_DETAILS on DOC_ORDER_DETAILS.ORDERNO=DOC_ORDER_HEADER.ORDERNO
+                      left join BAS_CODES on BAS_CODES.CODE=DOC_ORDER_HEADER.sostatus and BAS_CODES.codeid='SO_STS' 
+                      left join BAS_Customer on BAS_Customer.customerid=DOC_ORDER_HEADER.customerid 
+                      left join  BAS_SKU on DOC_Order_Details.CustomerID=BAS_SKU.CustomerID and DOC_Order_Details.SKU=BAS_SKU.SKU
+        group by DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
+        ,DOC_ORDER_HEADER.ConsigneeID,DOC_ORDER_HEADER.ConsigneeName,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
+         DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
+        ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
+         DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG
+        ,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,DOC_ORDER_HEADER.OrderTime,DOC_Order_Details.CustomerID,
+         DOC_Order_Details.SKU,DOC_Order_Details.QtyOrdered,DOC_Order_Details.OrderLineNo,
+         BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C,BAS_Codes.codename_c,BAS_Customer.descr_c order by ordertime desc" ;
+        $orders=DB::connection('oracle')->select(DB::raw($sql));
+        $commodities=[];
+        foreach ($orders as $index=>$order){
+            if (isset($commodities[$order->orderno])){
+                array_push($commodities[$order->orderno],
+                    ["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,"descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered]);
+                unset($orders[$index]);
+                continue;
+            }
+            $commodities[$order->orderno]=[["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,
+                "descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered]];
+        }
+        $orders=array_values($orders);
+        $orders = new Collection($orders);
+        $commodities=new Collection($commodities);
+        if ($checkData || $export)return $this->export($orders,$commodities);
+        $customers=OracleBasCustomer::select('customerid','descr_c')->where('customer_type','OW')->where('active_flag','Y')->get();
+        $request=$request->input();
+        return view('order/index/delivering',compact('orders','customers','request','commodities'));
+    }
+    public function batchComments(Request $request){
+        if(!Gate::allows('出库管理-批量注释')){ return redirect(url('/'));  }
+        $checkData=$request->input('checkData');
+        $content=$request->input('content');
+        $ordersNotNull=OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
+            ->whereNotNull('notes')->get();
+        OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
+            ->whereNull('notes')->update(['notes'=>$content]);
+        $ordersNotNullArr=array_column($ordersNotNull->toArray(),'orderno');
+        $ordersNullArr=array_diff($checkData,$ordersNotNullArr);
+        $data=[];
+        foreach ($ordersNotNull as $order){
+            OracleDOCOrderHeader::where('orderno',$order->orderno)->update(["notes"=>($order->notes).",".$content]);
+            $order->notes=($order->notes).",".$content;
+            array_push($data,$order);
+        }
+        foreach ($ordersNullArr as $order){
+            array_push($data,["orderno"=>$order,'notes'=>$content]);
+        }
+        return $data;
+    }
+
+    function export($orders,$commodities){
+        if(!Gate::allows('出库管理')){ return redirect(url('/'));  }
+        ini_set('max_execution_time',3500);
+        ini_set('memory_limit','3526M');
+        $row=[[
+            'orderno'=>'编号',
+            'sostatus'=>'订单状态',
+            'warehouseid'=>'仓库',
+            'oracleBASCustomer_descr_c'=>'客户',
+            'consigneeid'=>'收货人',
+            'consigneename'=>'收货人名称',
+            'c_tel1'=>'收货人电话',
+            'carriername'=>'承运人',
+            'issuepartyname'=>'下单方名称',
+            'waveno'=>'波次编号',
+            'soreference1'=>'客户订单号',
+            'soreference5'=>'快递单号',
+            'edisendflag2'=>'快递获取标记',
+            'edisendtime2'=>'快递获取时间',
+            'sku'=>'产品代码',
+            'alternate_sku1'=>'产品条码',
+            'descr_c'=>'产品名称',
+            'qtyordered'=>'订单数量',
+            'notes'=>'备注',
+            'erpcancelflag'=>'接口取消标记',
+            'picking_print_flag'=>'拣货单打印标记',
+            'edisendflag'=>'接口回传标记',
+            'releasestatus'=>'订单冻结标记',
+            'c_address1'=>'收货人地址',
+        ]];
+        $list=[];
+        $sign=[];
+        $mergeCell=[];
+        foreach ($orders as $order){
+            $data=[
+                'orderno'=>$order->orderno,
+                'sostatus'=>$order->codename_c,
+                'warehouseid'=>$order->warehouseid,
+                'oracleBASCustomer_descr_c'=>$order->customer_descr_c,
+                'consigneeid'=>$order->consigneeid,
+                'consigneename'=>$order->consigneename,
+                'c_tel1'=>$order->c_tel1,
+                'carriername'=>$order->carriername,
+                'issuepartyname'=>$order->issuepartyname,
+                'waveno'=>$order->waveno,
+                'soreference1'=>$order->soreference1,
+                'soreference5'=>$order->soreference5,
+                'edisendflag2'=>$order->edisendflag2,
+                'edisendtime2'=>$order->edisendtime2,
+                'notes'=>$order->notes,
+                'erpcancelflag'=>$order->erpcancelflag,
+                'picking_print_flag'=>$order->picking_print_flag,
+                'edisendflag'=>$order->edisendflag,
+                'releasestatus'=>$order->releasestatus,
+                'c_address1'=>$order->c_address1,
+            ];
+            if (count($commodities[$order->orderno])<1){
+                $data['sku']='';
+                $data['alternate_sku1']='';
+                $data['descr_c']='';
+                $data['qtyordered']='';
+                array_push($list,$data);
+                continue;
+            }
+            foreach ($commodities[$order->orderno] as $oracleDOCOrderDetail){
+                $data['sku']=$oracleDOCOrderDetail['sku'];
+                $data['alternate_sku1']=$oracleDOCOrderDetail['alternate_sku1'];
+                $data['descr_c']=$oracleDOCOrderDetail['descr_c'];
+                $data['qtyordered']=$oracleDOCOrderDetail['qtyordered'];
+                if (isset($sign[$order->orderno])){
+                    $data['orderno']='';$data['sostatus']='';$data['warehouseid']='';$data['oracleBASCustomer_descr_c']='';$data['consigneeid']='';$data['consigneename']='';
+                    $data['c_tel1']='';$data['carriername']='';$data['issuepartyname']='';$data['waveno']='';$data['soreference1']='';$data['soreference5']='';
+                    $data['edisendflag2']='';$data['edisendtime2']='';$data['notes']='';$data['erpcancelflag']='';$data['picking_print_flag']='';$data['edisendflag']='';
+                    $data['releasestatus']='';$data['c_address1']='';
+                    array_push($list,$data);
+                    continue;
+                }
+                array_push($list,$data);
+                $sign[$order->orderno]=count($list)+1;
+            }
+            if (count($commodities[$order->orderno])>1){
+                $mergeCell[$sign[$order->orderno]]=$sign[$order->orderno]+(count($commodities[$order->orderno])-1);
+            }
+        }
+        $columnName=["A","B","C","D","E","F","G","H","I","J","K","L","M","N","S","T","U","V","W","X"];
+        return Excel::download(new Export($row,$list,$mergeCell,$columnName),date('YmdHis', time()).'-出库发运单.xlsx');
+    }
+
+}

app/Http/Controllers/WaybillsController.php

@@ -46,7 +46,7 @@ class WaybillsController extends Controller
         if ($request->input('exportType')&&$request->input('exportType')==1){
             $checkData=explode(',',$request->input('checkData'));
             $waybills=$waybills->whereIn("id",$checkData)->get();
-            $excel=$this->forwardingExport($waybills);
+            $excel=$this->deliveringExport($waybills);
             return $excel;
         }
         if ($request->input('waybill_number')){
@@ -83,7 +83,7 @@ class WaybillsController extends Controller
         }
         if ($request->input('exportType')&&$request->input('exportType')==2){
             $waybills=$waybills->get();
-            $excel=$this->forwardingExport($waybills);
+            $excel=$this->deliveringExport($waybills);
             return $excel;
         }
         else $waybills=$waybills->paginate($request->input('paginate')?$request->input('paginate'):50);
@@ -694,7 +694,7 @@ class WaybillsController extends Controller
         return Excel::download(new Export($row,$list), date('Y:m:d ') . '运单列表.xlsx');
     }
 
-    public function forwardingExport($waybills){
+    public function deliveringExport($waybills){
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
         $row=[[
@@ -735,7 +735,7 @@ class WaybillsController extends Controller
     }
 
     //发运
-    public function forwarding(Request $request){
+    public function delivering(Request $request){
         if (Auth::user()->isSuperAdmin())$waybills=Waybill::orderBy('id','DESC');
         else{
             $carriersUsers=DB::table('carrier_user')->where('user_id',Auth::id())->get();
@@ -746,7 +746,7 @@ class WaybillsController extends Controller
             return $this->conditionQuery($request,$waybills);
         }
         $waybills=$this->conditionQuery($request,$waybills);
-        return view('waybill.forwarding',compact('waybills'));
+        return view('waybill.delivering',compact('waybills'));
     }
     //承运商提交
     public function storeCarrierBill(Request $request){

database/migrations/2020_06_04_162259_add_exit_authority.php → database/migrations/2020_06_04_162259_add_order_authority.php

@@ -5,7 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddExitAuthority extends Migration
+class AddOrderAuthority extends Migration
 {
     protected $authNames=[
         "订单管理",

resources/views/inventory/statement/changeInventory.blade.php

@@ -125,8 +125,8 @@
             <td class="text-muted">@{{ oracleActTransactingLog.批号 }}</td>
             <td>@{{ oracleActTransactingLog.移出数量 }}</td>
             <td>@{{ oracleActTransactingLog.移入数量 }}</td>
-            <td>@{{ oracleActTransactingLog.在库数量 }}</td>
-            <td>@{{ oracleActTransactingLog.占用数量 }}</td>
+            <td><span v-if="oracleActTransactingLog.在库数量">@{{ oracleActTransactingLog.在库数量 }}</span><span v-else>0</span></td>
+            <td><span v-if="oracleActTransactingLog.占用数量">@{{ oracleActTransactingLog.占用数量 }}</span><span v-else>0</span></td>
         </tr>
     </table>
     <form method="post" hidden action="{{url('inventory/statement/changeInventory/export')}}" id="checkDataForm">
@@ -145,8 +145,9 @@
     </form>
     <div >
         <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
-        <button type="button" @click="pageDown()" class="btn btn-sm btn-outline-info ml-5">下一页</button>
-        <input  @keyup.enter="pageSkip($event)" class="form-control-sm ml-3 tooltipTarget" :placeholder="'当前页数：'+page" title="去往指定页">
+        <button type="button" @click="pageDown()" :readonly="page<maxPage?false:true" class="btn btn-sm m-3" :class="page<maxPage?'btn-outline-info':''">下一页</button>
+        <input  @keyup.enter="pageSkip($event)" class="form-control-sm ml-3 tooltipTarget" :placeholder="'当前页数：'+page+'/'+maxPage" title="去往指定页">
+        <span class="text-muted m-1">共 @{{ sum }} 条</span>
     </div>
 </div>
 @endsection
@@ -166,11 +167,17 @@
                     @endforeach
                 ],
                 checkData:[],
+                maxPage:1,
+                sum:0
             },
             mounted:function () {
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 this.initInputs();
                 $("#list").removeClass('d-none');
+                if (this.oracleActTransactingLogs.length>0){
+                    this.maxPage=Math.ceil(this.oracleActTransactingLogs[0].sum/50);
+                    this.sum=this.oracleActTransactingLogs[0].sum;
+                }
             },
             computed:{
                 isBeingFilterConditions:function(){
@@ -217,12 +224,13 @@
                      this.href();
                 },
                 pageDown(){
+                    if (this.page>=this.maxPage)return;
                     this.page=this.page+1;
                     this.href();
                 },
                 pageSkip(e){
-                    this.page=e.target.value;
-                  if (Number(this.page)<=0){
+                  this.page=e.target.value;
+                  if (Number(this.page)<=0 || Number(this.page)>this.maxPage){
                       tempTip.setDuration(2000);
                       tempTip.show('页数不存在！ ');
                       return

resources/views/layouts/menu.blade.php

@@ -13,7 +13,7 @@
                     入库管理</a></li> @endcan
         @can('订单管理')
             <li class="nav-item"><a href="{{url("exit/index/forwarding")}}" class="nav-link"
-                                    :class="{active:isActive('exit',1)}">
+                                    :class="{active:isActive('order',1)}">
                     <span class="fa fa-calendar-check-o" style="color: #1b4b72"></span>
                     订单管理</a></li> @endcan
         @can('运输管理')

resources/views/exit/index/forwarding.blade.php → resources/views/order/index/delivering.blade.php

@@ -1,14 +1,14 @@
 @extends('layouts.app')
 
 @section('content')
-    @component('exit.index.menu')@endcomponent
+    @component('order.index.menu')@endcomponent
     <div id="list" class="d-none">
-        <form method="GET" action="{{url('exit/index/forwarding')}}" id="form">
+        <form method="GET" action="{{url('order/index/delivering')}}" id="form">
             <table class="table  table-sm table-bordered text-nowrap  mb-0 ml-3">
                 <tr v-if="isBeingFilterConditions">
                     <td colspan="10">
                         <div class="col" style="padding:0">
-                            <a  href="{{url('exit/index/forwarding')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                            <a  href="{{url('order')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
                         </div></td>
                 </tr>
                 <tr>
@@ -41,7 +41,7 @@
                         </select>
                     </td>
                     <td>
-                        <input name="soreference1" v-model="filterData.soreference1" class="form-control-sm tooltipTarget" placeholder="发运单号" :class="filterData.soreference1?'bg-warning':''">
+                        <input name="orderno" v-model="filterData.orderno" class="form-control-sm tooltipTarget" placeholder="发运单号" :class="filterData.orderno?'bg-warning':''">
                     </td>
                     <td >
                         <input name="soreference5" title="可输出多快递单号" v-model="filterData.soreference5" class="form-control-sm tooltipTarget" placeholder="快递单号" :class="filterData.soreference5?'bg-warning':''">
@@ -56,8 +56,8 @@
                                     导出Excel
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" @click="exitExport(1)" href="javascript:">导出勾选内容</a>
-                                    <a class="dropdown-item" @click="exitExport(2)" href="javascript:">导出所有页</a>
+                                    <a class="dropdown-item" @click="orderExport(1)" href="javascript:">导出勾选内容</a>
+                                    <a class="dropdown-item" @click="orderExport(2)" href="javascript:">导出所有页</a>
                                 </div>
                         </span>
                         @can('订单管理-批量备注')<button @click="modal()" type="button" class="btn btn-sm ml-2 btn-outline-primary">批量备注追加</button>@endcan
@@ -120,9 +120,9 @@
                 </td>
                 <td>@{{ i+1 }}</td>
                 <td class="text-dark font-weight-bold">@{{ order.orderno }}</td>
-                <td class="text-muted">@{{ order.oracleBASCode_codename_c }}</td>
+                <td class="text-muted">@{{ order.codename_c }}</td>
                 <td> @{{ order.warehouseid }}</td>
-                <td >@{{ order.oracleBASCustomer_descr_c }}</td>
+                <td >@{{ order.customer_descr_c }}</td>
                 <td class="text-muted">@{{ order.consigneeid }}</td>
                 <td class="text-muted">@{{ order.consigneename }}</td>
                 <td class="text-muted">@{{ order.c_tel1 }}</td>
@@ -134,8 +134,8 @@
                 <td>@{{ order.edisendflag2 }}</td>
                 <td>@{{ order.edisendtime2 }}</td>
                 <td colspan="4" class="text-center">
-                    <table v-if="order.oracle_d_o_c_order_details.length==1 || isBtn[order.orderno]" class="table table-sm">
-                        <tr v-for="oracleDOCOrderDetail in order.oracle_d_o_c_order_details">
+                    <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table table-sm">
+                        <tr v-for="oracleDOCOrderDetail in commodities[order.orderno]">
                             <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.sku }}</div></td>
                             <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div></td>
                             <td><div :title="oracleDOCOrderDetail.descr_c" class="tooltipTarget" style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.descr_c }}</div></td>
@@ -147,7 +147,7 @@
                             </td>
                         </tr>
                     </table>
-                    <b @click="unfold(order.orderno)" style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" v-if="order.oracle_d_o_c_order_details.length>1 && !isBtn[order.orderno]">共有 @{{ order.oracle_d_o_c_order_details.length }}  件商品，点击展开</b>
+                    <b @click="unfold(order.orderno)" style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1 && !isBtn[order.orderno]">共有 @{{ commodities[order.orderno].length }}  件商品，点击展开</b>
                 </td>
                 <td>@{{ order.notes }}</td>
                 <td>@{{ order.erpcancelflag }}</td>
@@ -157,7 +157,7 @@
                 <td>@{{ order.c_address1 }}</td>
             </tr>
         </table>
-        {{$orders->appends($request)->links()}}
+
     </div>
 @endsection
 
@@ -167,7 +167,7 @@
             el:"#list",
             data:{
                 filterData:{
-                    paginate:50,ordertime_start:'',ordertime_end:'',customerid:'',soreference1:'',soreference5:'',
+                    paginate:50,ordertime_start:'',ordertime_end:'',customerid:'',orderno:'',soreference5:'',
                 },
                 checkData:[],
                 owners:[
@@ -175,11 +175,8 @@
                     {!! $customer !!},
                     @endforeach
                 ],
-                orders:[
-                    @foreach($orders as $order)
-                    {!! $order !!},
-                    @endforeach
-                ],
+                orders:{!! $orders !!},
+                commodities:{!! $commodities !!},
                 isBtn:{},
                 content:'',
             },
@@ -261,18 +258,18 @@
                         $(".tooltipTarget").tooltip({'trigger':'hover'});
                     },1);
                 },
-                exitExport(val){
+                orderExport(val){
                     if (val==1){
                         if (this.checkData.length<1) {
                             tempTip.setDuration(3000);
                             tempTip.showSuccess('没有勾选任何记录')
                             return;
                         }
-                        window.location.href="{{url('exit/index/forwarding?checkData=')}}"+this.checkData;
+                        window.location.href="{{url('order/index/delivering?checkData=')}}"+this.checkData;
                         return;
                     }
-                    window.location.href="{{url('exit/index/forwarding?ordertime_start=')}}"+this.filterData.ordertime_start
-                    +"&&ordertime_end="+this.filterData.ordertime_end+"&&soreference1="+this.filterData.soreference1
+                    window.location.href="{{url('order/index/delivering?ordertime_start=')}}"+this.filterData.ordertime_start
+                    +"&&ordertime_end="+this.filterData.ordertime_end+"&&orderno="+this.filterData.orderno
                     +"&&soreference5="+this.filterData.soreference5+"&&export="+true;
                 },
                 modal(){
@@ -287,7 +284,7 @@
                         else tempTip.showSuccess('没有输入任何内容');
                         return;
                     }
-                    axios.post('{{url('exit/create/batchComments')}}',{checkData:this.checkData,content:this.content})
+                    axios.post('{{url('order/create/batchComments')}}',{checkData:this.checkData,content:this.content})
                         .then(function (response) {
                             let sign=[];
                             _this.orders.every(function (order) {

resources/views/exit/index/menu.blade.php → resources/views/order/index/menu.blade.php

@@ -1,12 +1,12 @@
 <div id="nav2">
-    @component('exit.menu')
+    @component('order.menu')
     @endcomponent
     <div class="container-fluid nav3">
         <div class="card menu-third" >
             <ul class="nav nav-pills">
                 @can('订单管理-发运')
                     <li class="nav-item">
-                        <a class="nav-link text-dark" href="{{url('exit/index/forwarding')}}" :class="{active:isActive('forwarding',3)}">发运</a>
+                        <a class="nav-link text-dark" href="{{url('order/index/delivering')}}" :class="{active:isActive('delivering',3)}">发运</a>
                     </li> @endcan
             </ul>
         </div>

resources/views/exit/menu.blade.php → resources/views/order/menu.blade.php

@@ -4,7 +4,7 @@
         <ul class="nav nav-pills">
             @can('订单管理-发运')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('exit/index/forwarding')}}" :class="{active:isActive('index',2)}">查询</a>
+                <a class="nav-link" href="{{url('order/index/delivering')}}" :class="{active:isActive('index',2)}">查询</a>
             </li> @endcan
         </ul>
     </div>

resources/views/waybill/forwarding.blade.php → resources/views/waybill/delivering.blade.php

@@ -3,11 +3,11 @@
 @section('content')
     @component('waybill.menu')@endcomponent
     <div id="list" class="d-none container-fluid">
-        <form method="GET" action="{{url('waybill/forwarding')}}" id="form">
+        <form method="GET" action="{{url('waybill/delivering')}}" id="form">
             <div class="text-nowrap mb-0" style="background: #fff;">
                 <div v-if="isBeingFilterConditions">
                     <div><div class="col" style="padding:0">
-                            <a  href="{{url('waybill/forwarding')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                            <a  href="{{url('waybill/delivering')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
                         </div>
                     </div>
                 </div>
@@ -264,7 +264,7 @@
                     tempTip.showSuccess('没有勾选任何记录');
                     return;
                 }
-                window.location.href="{{url('waybill/forwarding?created_at_start=')}}"
+                window.location.href="{{url('waybill/delivering?created_at_start=')}}"
                     +this.filterData.created_at_start+"&&created_at_end="+this.filterData.created_at_end
                     +"&&waybill_number="+this.filterData.waybill_number+"&&carrier_bill="+this.filterData.carrier_bill
                     +"&&exportType="+value+"&&checkData="+this.checkData;

resources/views/waybill/menu.blade.php

@@ -12,7 +12,7 @@
             </li> @endcan
             @can('运输管理-发运')
             <li class="nav-item">
-                <a class="nav-link" href="{{url('waybill/forwarding')}}" :class="{active:isActive('forwarding',2)}">发运</a>
+                <a class="nav-link" href="{{url('waybill/delivering')}}" :class="{active:isActive('delivering',2)}">发运</a>
             </li> @endcan
             {{$slot}}
             <li class="nav-item">

routes/web.php

@@ -74,7 +74,7 @@ Route::resource('waybill/waybillFinancialExcepted','WaybillFinancialExceptedCont
 Route::any('waybill/create/ZF','WaybillsController@createZF');
 Route::any('waybill/create/ZX','WaybillsController@createZX');
 Route::get('waybill/index','WaybillsController@index');
-Route::get('waybill/forwarding','WaybillsController@forwarding');
+Route::get('waybill/delivering','WaybillsController@delivering');
 Route::post('waybill/storeCarrierBill','WaybillsController@storeCarrierBill');
 Route::resource('waybill','WaybillsController');
 Route::get('waybill/index/ZF','WaybillsController@indexZF');
@@ -223,9 +223,9 @@ Route::group(['prefix'=>'inventory'],function (){
 /**
  * 出库
  */
-Route::group(['prefix'=>'exit'],function(){
+Route::group(['prefix'=>'order'],function(){
     //发运
-    Route::get('index/forwarding','ExitController@forwarding');
+    Route::get('index/delivering','OrderController@delivering');
     //批量备注
-    Route::post('create/batchComments','ExitController@batchComments');
+    Route::post('create/batchComments','OrderController@batchComments');
 });