diff --git a/public/css/wms.css b/public/css/wms.css
index 2d2fd5bf31f22c50f5549640f269d5f723750d14..faf2250a67903f7bce57c8242fce7a8b9274c935 100644
--- a/public/css/wms.css
+++ b/public/css/wms.css
@@ -1152,6 +1152,7 @@ table tr.checkStatus{
 }
 #bs_sws_exportExcel{
     color: #fff !important;
+    text-decoration: none;
 }
 .abm_image{
     width: 100%;
diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js
index be492e0b41d3a0ab256581f35f23bc66e011ddc5..b03fb6e92e0978a7d366ed8d1005d7333bbc14be 100644
--- a/public/js/ctrl/a.ctrl.js
+++ b/public/js/ctrl/a.ctrl.js
@@ -329,7 +329,7 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService',
         }
 
         angular.forEach(scope.ngDialogData.printList,function(v,k){
-            scope.Tools.printQr(v.barcode,null,null,v.vin,1);
+            scope.Tools.printQr(v.barcode,v.vin,null,null,1,scope.constant.userWarehouseType.JM_);
         })
     };
 
diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js
index 85b6be75fb3fb1ef9e5d6e21f90de442f6dcb748..5fcdc29e11ab563ac15c0369308c26a3513d4e40 100644
--- a/public/js/ctrl/i.ctrl.js
+++ b/public/js/ctrl/i.ctrl.js
@@ -795,7 +795,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow
                                 scope.Tools.dialogConfirm('该车辆【'+ scope.ngDialogData.queryParam +'】收货已完成，确定后打印二维码')
                                     .then(function(res){
                                         if(res){
-                                            scope.Tools.printQr(result.data.odRemark,result.data.asnOrderDetailDTOList[0].oddVin,result.data.asnOrderDetailDTOList[0].oddWhLocName,result.data.odWaybillNo,2);
+                                            scope.Tools.printQr(result.data.odRemark,result.data.asnOrderDetailDTOList[0].oddVin,result.data.asnOrderDetailDTOList[0].oddWhLocName,result.data.odWaybillNo,2,scope.constant.userWarehouseType.UNLCN_XN_);
                                         }
                                     })
                                  scope.list(scope.listParam());
@@ -1018,7 +1018,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow
             }
 
             angular.forEach(scope.ngDialogData.printList,function(v,k){
-                scope.Tools.printQr(v.barcode,v.vin,v.locNo,v.asnOrderBillNo,2);
+                scope.Tools.printQr(v.barcode,v.vin,v.locNo,v.asnOrderBillNo,2,scope.constant.userWarehouseType.UNLCN_XN_);
             })
         }
     }])
diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js
index dbe40e22ee8c72b0a6ed78bc98835e35779b9ef4..dd209dfea261f35714098a2f0117eb08aafabad6 100644
--- a/public/js/ctrl/s.ctrl.js
+++ b/public/js/ctrl/s.ctrl.js
@@ -1880,7 +1880,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService
                         }
                     }else{
                         layer.close(index);
-                        $scope.Tools.alert(result.message);
+                        $scope.Tools.open(result.message);
                         $scope.tableList=[];
                     }
                 })
@@ -1896,12 +1896,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService
                 if($scope.Tools.isRange($scope.search.orderBegin,$scope.search.orderEnd)){
                     if($scope.Tools.isRange($scope.search.inboundBegin,$scope.search.inboundEnd)){
                         $scope.getList();
-                        // searchWaybillStatusService.getTrackList($scope.search).then(function (res) {
-                        //     if (res.success) {
-                        //         $scope.tableList = res.data;
-                        //     }
-                        // })
-
                     }  else {
                         $scope.Tools.alert('入库起始时间必须小于等于入库结束时间！');
                     }
@@ -1925,10 +1919,4 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService
                 userId:$scope.userInfo.id
             };
         };
-
-        // $timeout(function(){
-        //     $('#bs_sws_exportExcel').ExportExcel('bs_sws_mainTable');
-        // },20);
-
-
     }]);
\ No newline at end of file
diff --git a/public/js/wms-config.js b/public/js/wms-config.js
index 5c618201dda4e25838b52689909dc13bc130d66c..f2284d3106bc41027bc36d798e030dde01c4277e 100644
--- a/public/js/wms-config.js
+++ b/public/js/wms-config.js
@@ -9,7 +9,21 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
             path: contextPath
         }
     })
-    .run(['$rootScope', '$location', '$state', 'Settings','Tools','constant','dropDownService','$cookies','permissionsService','Restangular','FileUploader','$timeout','ngDialog', function ($rootScope, $location, $state, Settings,Tools,constant,dropDownService,cookies,permissionsService,restangular,FileUploader,timeout,ngDialog) {
+    .run(['$timeout','$rootScope', '$location', '$state', 'Settings','Tools','constant','dropDownService','$cookies','permissionsService','Restangular','FileUploader','$timeout','ngDialog', function ($timeout,$rootScope, $location, $state, Settings,Tools,constant,dropDownService,cookies,permissionsService,restangular,FileUploader,timeout,ngDialog) {
+        //关闭全局定时任务
+        $timeout(function(){
+
+            $('.layui-nav-tree a').click(function(){
+                window.clearTimeout($rootScope.bs_timer1);
+                window.clearTimeout($rootScope.bs_timer2);
+                window.clearTimeout($rootScope.bs_timer3);
+                window.clearTimeout($rootScope.bs_timer4);
+                window.clearTimeout($rootScope.bs_timer5);
+                console.log('Aa');
+            });
+        },1000);
+
+
         $rootScope.$ = layui.jquery;
         layui.use(['form', 'laydate'], function () {
             $rootScope.$ = layui.jquery;
@@ -462,7 +476,7 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 controller:'searchWaybillStatusCtrl',
                 url:'/searchWaybillStatus',
                 templateUrl:'templates/bigScreen/searchWaybillStatus.html'
-            })
+            });
 
 
         $urlRouterProvider.otherwise('index');
diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js
index 1ebcd397c96412a703988ae6dcaacd7654a7ac70..f98ebfd4c17eeb5d40b67de76743902c7158af7f 100644
--- a/public/js/wms-tools.js
+++ b/public/js/wms-tools.js
@@ -509,6 +509,15 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
                 layer.msg(msg);
             }
         },
+        open : function(msg){   // 当返回信息较多时，弹出永久弹出框，供用户关闭
+            if(msg){
+                layer.open({
+                    title: '提示',
+                    content :msg
+                })
+            }
+
+        },
         page : function(element,settings,callback){ //分页
             if(!settings){
                 settings = {};
@@ -602,7 +611,7 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
             newWin.document.write('<script type="text/javascript">setTimeout(function(){window.print();window.close()},500)</script>');
             newWin.document.write('</body></html>');
         },
-        printQr : function(base64,vin,localNo,orderBillNo,pages){   //打印二维码   localNo 库位 orderBillNo运单号
+        printQr : function(base64,vin,localNo,orderBillNo,pages,whCode){   //打印二维码   localNo 库位 orderBillNo运单号
 
             if(!vin){
                 vin = '';
@@ -616,16 +625,28 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c
                 orderBillNo = '';
             }
 
-            var tableStart = '<table border="0" style="font-size: 12px; margin: 0px; padding: 0px; font-weight:bold;border:none;" width="112px">';
-            var tr1 = '<tr><td rowspan="2" style="overflow: hidden"><div style="width:43px;height:43px;overflow:hidden"><img style="margin-top: -8px;margin-left: -8px" src="data:image/png;base64,'+base64+'"/></div></td><td>'+vin.substring(10,17)+'</td></tr>';
-            var tr2 = '<tr><td>' + localNo +'</td></tr>';
-            var tr3 = '<tr><td colspan="2" style="font-size: 10px;margin: 0px; padding: 0px;">'+orderBillNo+'</td></tr>';
-            var tableEnd = '</table>';
-
-            var html = tableStart + tr1 + tr2 + tr3 + tableEnd;
+            var html = '';
             LODOP.PRINT_INIT("二维码打印");
-            LODOP.SET_PRINT_PAGESIZE(0,300,200);
-            LODOP.ADD_PRINT_HTM(7,7,'13mm','18mm',html);
+
+            if(whCode == constant.userWarehouseType.UNLCN_XN_){
+                var tableStart = '<table border="0" style="font-size: 12px; margin: 0px; padding: 0px; font-weight:bold;border:none;" width="112px">';
+                var tr1 = '<tr><td rowspan="2" style="overflow: hidden"><div style="width:43px;height:43px;overflow:hidden"><img style="margin-top: -8px;margin-left: -8px" src="data:image/png;base64,'+base64+'"/></div></td><td>'+vin.substring(10,17)+'</td></tr>';
+                var tr2 = '<tr><td>' + localNo +'</td></tr>';
+                var tr3 = '<tr><td colspan="2" style="font-size: 10px;margin: 0px; padding: 0px;">'+orderBillNo+'</td></tr>';
+                var tableEnd = '</table>';
+                html = tableStart + tr1 + tr2 + tr3 + tableEnd;
+                LODOP.SET_PRINT_PAGESIZE(0,300,200);
+                LODOP.ADD_PRINT_HTM(7,7,'13mm','18mm',html);
+            }else if(whCode == constant.userWarehouseType.JM_){
+                var tableStart = '<table border="0" style="font-size: 12px; margin: 0px; padding: 0px; font-weight:bold; height: 100px;">';
+                var tr1 = '<tr><td><img style="margin-left: -8px" src="data:image/png;base64,'+base64+'"/></td></tr>';
+                var tr2 = '<tr><td><div style="margin-left: 72px;">'+vin+'</div></td></tr>';
+                var tableEnd = '</table>';
+                html = tableStart + tr1 + tr2 + tableEnd;
+                LODOP.SET_PRINT_PAGESIZE(0,700,1000);
+                LODOP.ADD_PRINT_HTM(10,0,'70mm','100mm',html);
+            }
+
             if(pages){
                 LODOP.SET_PRINT_COPIES(pages);  //设置打印数量
             }
diff --git a/public/templates/bigScreen/searchWaybillStatus.html b/public/templates/bigScreen/searchWaybillStatus.html
index 4c3af563b48c50d99cf66ac67bb3ada531025454..a85ed1285c59f0d9ab02eb703d5d607cf7f23098 100644
--- a/public/templates/bigScreen/searchWaybillStatus.html
+++ b/public/templates/bigScreen/searchWaybillStatus.html
@@ -2,12 +2,7 @@
     <div class="main-content">
         <div class="page-function">
             <ul class="wms-wbm-fun-left">
-                <!--{{contextPath}}-->
-                <!--<form action= "">-->
-                    <!--<input class="layui-btn" type="submit" value="导出Excel">-->
-                <!--</form>-->
-                <!--<a class="layui-btn"  ng-href="{{excelUrl}}"  ng-click="importOutExcel()" id="bs_sws_exportExcel" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.JM_) != -1 || userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">导出Excel</a>-->
-                <a class="layui-btn"  ng-href="{{excelUrl}}" ng-click="getData($event)"  id="bs_sws_exportExcel" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.JM_) != -1 || userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">导出Excel</a>
+                <a class="layui-btn"  ng-href="{{excelUrl}}" ng-click="getData($event)"  id="bs_sws_exportExcel" ng-if="userInfo.whCode.indexOf(constant.userWarehouseType.JM_) != -1 || userInfo.whCode.indexOf(constant.userWarehouseType.UNLCN_XN_) != -1">导出</a>
             </ul>
             <div class="wms-wbm-fun-right">
                 <!--<input type="text" placeholder="单据号&ndash;&gt;回车查询" ng-model="search.odWaybillNo" ng-keydown="searchListKeyDown($event)" class="search-input">-->
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js
index 102a92681e456ef8e2f21a2e82089a3e57b1f38c..1ccfe44f6eb1f0c02363698627c510fc719810f2 100644
--- a/routes/resource/base-config.js
+++ b/routes/resource/base-config.js
@@ -1,3 +1,3 @@
-/**Created on 2017-11-27*/
+/**Created on 2017-11-28*/
 
'use strict';
-
module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.80:8080/ils-wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}};
\ No newline at end of file
+
module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}};
\ No newline at end of file