|
|
@@ -14,7 +14,7 @@ use Maatwebsite\Excel\Facades\Excel;
|
|
|
class OrderController extends Controller
|
|
|
{
|
|
|
public function delivering(Request $request){
|
|
|
- if(!Gate::allows('出库管理-发运')){ return redirect(url('/')); }
|
|
|
+ if(!Gate::allows('订单管理-发运')){ return redirect(url('/')); }
|
|
|
$paginate=$request->input('paginate')??50;
|
|
|
$page=$request->input('page')??1;
|
|
|
$ordertime_start=$request->input('ordertime_start');
|
|
|
@@ -75,8 +75,8 @@ class OrderController extends Controller
|
|
|
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_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,
|
|
|
@@ -107,7 +107,7 @@ class OrderController extends Controller
|
|
|
return view('order/index/delivering',compact('orders','customers','request','commodities'));
|
|
|
}
|
|
|
public function batchComments(Request $request){
|
|
|
- if(!Gate::allows('出库管理-批量注释')){ return redirect(url('/')); }
|
|
|
+ if(!Gate::allows('订单管理-批量注释')){ return redirect(url('/')); }
|
|
|
$checkData=$request->input('checkData');
|
|
|
$content=$request->input('content');
|
|
|
$ordersNotNull=OracleDOCOrderHeader::select('OrderNo','Notes')->whereIn('orderno',$checkData)
|
|
|
@@ -129,7 +129,7 @@ class OrderController extends Controller
|
|
|
}
|
|
|
|
|
|
function export($orders,$commodities){
|
|
|
- if(!Gate::allows('出库管理')){ return redirect(url('/')); }
|
|
|
+ if(!Gate::allows('订单管理')){ return redirect(url('/')); }
|
|
|
ini_set('max_execution_time',3500);
|
|
|
ini_set('memory_limit','3526M');
|
|
|
$row=[[
|
LD