From 78f4d7a4b40a557a0b4d520526acdd5c23a3eeff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com>
Date: Fri, 29 Dec 2017 18:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/templates/bigScreen/searchWaybillStatus.html       | 8 ++++++++
 .../outboundOrder/outbound-order-list.html                | 4 ++++
 routes/resource/base-config.js                            | 4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/public/templates/bigScreen/searchWaybillStatus.html b/public/templates/bigScreen/searchWaybillStatus.html
index a85ed128..590d9def 100644
--- a/public/templates/bigScreen/searchWaybillStatus.html
+++ b/public/templates/bigScreen/searchWaybillStatus.html
@@ -88,6 +88,7 @@
                     <!--</th>-->
                     <th>底盘号</th>
                     <th>入前置库时间</th>
+                    <th>收车异常情况</th>
                     <th>下单时间(SAP备料)</th>
                     <th>调度时间</th>
                     <th>备料出库时间</th>
@@ -99,7 +100,10 @@
                     <th>联系方式</th>
                     <th>运抵时间</th>
                     <th>SAP收车时间</th>
+                    <th>目的地</th>
                     <th>经销商</th>
+                    <th>经销商联系方式</th>
+                    <th>出库异常信息</th>
                 </tr>
                 <tr ng-repeat="item in tableList">
                     <!--<td>-->
@@ -110,6 +114,7 @@
                     <!--</td>-->
                     <td ng-bind="item.vin"></td>
                     <td ng-bind="item.inboundTime"></td>
+                    <td ng-bind="item.receiveExcpDesc"></td>
                     <td ng-bind="item.orderTime"></td>
                     <td ng-bind="item.shipTime"></td>
                     <td ng-bind="item.outboundTime"></td>
@@ -121,7 +126,10 @@
                     <td ng-bind="item.mobile"></td>
                     <td ng-bind="item.arrivedTime"></td>
                     <td ng-bind="item.pickTime"></td>
+                    <td ng-bind="item.routeEnd"></td>
                     <td ng-bind="item.dealer"></td>
+                    <td ng-bind="item.dealerMobile"></td>
+                    <td ng-bind="item.shipExcpDesc"></td>
                 </tr>
                 </tbody>
             </table>
diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html
index 93302282..b45f6ea5 100644
--- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html
+++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html
@@ -101,6 +101,8 @@
                         <th>计划装车道</th>
                         <th>计划装车时间</th>
                         <th>预计完成时间</th>
+                        <th>实际进场时间</th>
+                        <th>实际出场时间</th>
                         <th>备料状态</th>
                     </tr>
                     <tr ng-repeat="outboundOrder in outboundOrderList" ng-click="selectItemClick(outboundOrder,$event)">
@@ -117,6 +119,8 @@
                         <td ng-bind="outboundOrder.ppEstimateLane"></td>
                         <td ng-bind="outboundOrder.ppEstimateLoadingTime"></td>
                         <td ng-bind="outboundOrder.ppEstimateFinishTime"></td>
+                        <td ng-bind="outboundOrder.ppGateInTime"></td>
+                        <td ng-bind="outboundOrder.ppGateOutTime"></td>
                         <td ng-bind="outboundOrder.ppStatus | outboundStatusFilter"></td>
                     </tr>
                 </tbody>
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js
index 2e6df10d..7b365d3f 100644
--- a/routes/resource/base-config.js
+++ b/routes/resource/base-config.js
@@ -1,3 +1,3 @@
-/**Created on 2017-12-28*/
+/**Created on 2017-12-29*/
 
'use strict';
-
module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://wms.unlcn.com/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"plc_SUnCe)F*`WI"}};
\ No newline at end of file
+
module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}};
\ No newline at end of file
-- 
Gitee