订单管理增加复核时间字段

app/Http/Controllers/OrderController.php

@@ -30,7 +30,7 @@ class OrderController extends Controller
         $addtime=$request->input('addtime');
         $checkData=$request->input('checkData');
         $export=$request->input('export');
-        $sql="select DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
+        $sql="select ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,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,
@@ -45,7 +45,7 @@ class OrderController extends Controller
                          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 (select * from DOC_ORDER_HEADER  order by ADDTIME desc )DOC_ORDER_HEADER where 1=1";
+                          ,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,DOC_ORDER_HEADER.OrderTime from (select * from DOC_ORDER_HEADER  order by ADDTIME desc )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."'";
@@ -92,6 +92,7 @@ class OrderController extends Controller
                       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
+                      left join ACT_ALLOCATION_DETAILS on DOC_Order_Details.orderno=ACT_ALLOCATION_DETAILS.orderno and DOC_Order_Details.orderlineno=ACT_ALLOCATION_DETAILS.orderlineno 
         group by DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
          DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
@@ -99,18 +100,19 @@ class OrderController extends Controller
          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" ;
+         BAS_SKU.Alternate_SKU1,BAS_SKU.Descr_C,BAS_Codes.codename_c,BAS_Customer.descr_c,ACT_ALLOCATION_DETAILS.CHECKTIME order by ordertime" ;
         $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]);
+                    ["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,"descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered
+                    ,"checktime"=>$order->checktime]);
                 unset($orders[$index]);
                 continue;
             }
             $commodities[$order->orderno]=[["sku"=>$order->sku,"alternate_sku1"=>$order->alternate_sku1,
-                "descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered]];
+                "descr_c"=>$order->descr_c,"qtyordered"=>$order->qtyordered,"checktime"=>$order->checktime]];
         }
         $orders=array_values($orders);
         $orders = new Collection($orders);

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

@@ -110,8 +110,8 @@
                 </div><!-- /.modal-content -->
             </div><!-- /.modal -->
         </div>
-        <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2 ml-3">
-            <tr>
+        <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3">
+            <tr class="text-nowrap">
                 <th>
                     <label for="all">
                         <input id="all" type="checkbox" @click="checkAll($event)">全选
@@ -140,6 +140,7 @@
                 <th style="width: 200px">产品条码</th>
                 <th style="width: 200px">产品名称</th>
                 <th>订单数量</th>
+                <th>复核时间</th>
                 <th>备注</th>
                 <th>接口取消标记</th>
                 <th>拣货单打印标记</th>
@@ -152,34 +153,35 @@
                     <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
                 </td>
                 <td>@{{ i+1 }}</td>
-                <td class="text-dark font-weight-bold">@{{ order.orderno }}</td>
-                <td class="text-muted">@{{ order.codename_c }}</td>
-                <td>@{{ order.addtime }}</td>
-                <td>@{{ order.issuepartyname }}</td>
-                <td >@{{ order.customer_descr_c }}</td>
-                <td>@{{ order.soreference1 }}</td>
-                <td class="text-muted">@{{ order.carriername }}</td>
-                <td>@{{ order.soreference5 }}</td>
-                <td class="text-muted">@{{ order.c_contact }}</td>
-                <td class="text-muted">@{{ order.c_tel1 }}</td>
-                <td> @{{ order.c_province }}</td>
-                <td> @{{ order.c_city }}</td>
-                <td> @{{ order.c_district }}</td>
+                <td class="text-dark font-weight-bold text-nowrap">@{{ order.orderno }}</td>
+                <td class="text-muted text-nowrap">@{{ order.codename_c }}</td>
+                <td class="text-nowrap">@{{ order.addtime }}</td>
+                <td class="text-nowrap">@{{ order.issuepartyname }}</td>
+                <td class="text-nowrap">@{{ order.customer_descr_c }}</td>
+                <td class="text-nowrap">@{{ order.soreference1 }}</td>
+                <td class="text-muted text-nowrap">@{{ order.carriername }}</td>
+                <td class="text-nowrap">@{{ order.soreference5 }}</td>
+                <td class="text-muted text-nowrap">@{{ order.c_contact }}</td>
+                <td class="text-muted text-nowrap">@{{ order.c_tel1 }}</td>
+                <td class="text-nowrap"> @{{ order.c_province }}</td>
+                <td class="text-nowrap"> @{{ order.c_city }}</td>
+                <td class="text-nowrap"> @{{ order.c_district }}</td>
                 <td>@{{ order.c_address1 }}</td>
-                <td>@{{ order.waveno }}</td>
-                <td> @{{ order.warehouseid }}</td>
-                <td>@{{ order.edisendflag2 }}</td>
-                <td>@{{ order.edisendtime2 }}</td>
-                <td colspan="4" class="text-center">
-                    <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table table-sm">
+                <td class="text-nowrap">@{{ order.waveno }}</td>
+                <td class="text-nowrap"> @{{ order.warehouseid }}</td>
+                <td class="text-nowrap">@{{ order.edisendflag2 }}</td>
+                <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
+                <td colspan="5" class="text-center">
+                    <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap 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>
                             <td>@{{ oracleDOCOrderDetail.qtyordered }}</td>
+                            <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.checktime }}</div></td>
                         </tr>
                         <tr v-if="isBtn[order.orderno]">
-                            <td colspan="4">
+                            <td colspan="5">
                                 <b style="cursor:pointer;color: #4aa0e6;" @click="isBtn[order.orderno]=false;">点击收起明细</b>
                             </td>
                         </tr>