一个小修复，为了切换分支而提交

app/Services/OrderService.php

@@ -343,7 +343,7 @@ SQL;
                          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_HEADER.EDIREMARKS2 from DOC_ORDER_HEADER where 1=1 ";
+                          ,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,DOC_ORDER_HEADER.OrderTime,DOC_ORDER_HEADER.EDIREMARKS2 from (SELECT * FROM DOC_ORDER_HEADER ORDER BY ADDTIME DESC)DOC_ORDER_HEADER where 1=1 ";
         $sql = $this->preciseQuery($params, $sql);
         if ($checkData) {
             if (!is_array($checkData)) $checkData = explode(',', $checkData);
@@ -361,7 +361,7 @@ SQL;
         }
         if (isset($params["alternate_sku1"])) $page = 1;
         if ($paginate && $page) $sql .= " and ROWNUM<='" . $page * $paginate . "')";
-        if ($paginate && $page) $sql .= " header where header.rn>'" . ($page - 1) * $paginate . "' order by ADDTIME desc";
+        if ($paginate && $page) $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  order_code on order_code.CODE=DOC_ORDER_HEADER.sostatus and order_code.codeid='SO_STS'
                       left join BAS_CODES  order_detail_code on order_detail_code.CODE=DOC_ORDER_DETAILS.linestatus and order_detail_code.codeid='SO_STS'
@@ -379,6 +379,7 @@ SQL;
                       DOC_Order_Details.LineStatus,DOC_Order_Details.OrderLineNo,order_code.codename_c,order_detail_code.codename_c,BAS_Customer.descr_c,
                       BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C ORDER BY DOC_ORDER_HEADER.ADDTIME desc)";
         return $sql;
+
     }
 
     //通过商品条码获取订单编号

resources/views/equipment/index.blade.php

@@ -0,0 +1,14 @@
+@extends('layouts.app')
+@section('title')设备管理@endsection
+@section('content')
+<div class="container-fluid">
+
+</div>
+@endsection
+@section('lastScript')
+<script>
+    new Vue({
+        el:"#container",
+    });
+</script>
+@stop