diff --git a/public/js/wms-config.js b/public/js/wms-config.js
index bb813abbd7600f896b86bc705bbe5f76f0a6f872..bcb05c28957261b0f1a97889a3bb7123f6dfe60a 100644
--- a/public/js/wms-config.js
+++ b/public/js/wms-config.js
@@ -79,7 +79,7 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 var $cite = $(this).children('span');
                 if ($cite.text() === title) {
                     tabId = $(this).attr('lay-id');
-                };
+                }
             });
             return tabId;
         }
@@ -90,7 +90,7 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 var $cite = $(this).children('span');
                 if ($cite.text() === title) {
                     tabIndex = i;
-                };
+                }
             });
             return tabIndex;
         }
@@ -215,10 +215,12 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
             if(headers){
                 headers.whCode = $rootScope.userInfo.whCode;
                 headers.token = $rootScope.userInfo.token;
+                headers.userId = $rootScope.userInfo.id;
             }else{
                 headers = {
                     whCode : $rootScope.userInfo.whCode,
-                    token : $rootScope.userInfo.token
+                    token : $rootScope.userInfo.token,
+                    userId : $rootScope.userInfo.id
                 }
             }
             return {
@@ -314,7 +316,7 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 controller : 'roleCtrl',
                 url: '/role',
                 templateUrl: 'templates/systemManagement/roleManagement/role-list.html'
-            })
+            });
 
         $urlRouterProvider.otherwise('index');
 
@@ -370,4 +372,4 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi
                 ? param(data)
                 : data;
         }];*/
-    }])
\ No newline at end of file
+    }]);
\ No newline at end of file
diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js
index a205bb99b9dbba9bf06428930daa29b97e42f3bd..ecf8ed0d3a8dab643cd970f884038c47bb0880a0 100644
--- a/public/js/wms-constant.js
+++ b/public/js/wms-constant.js
@@ -94,14 +94,14 @@ angular.module('wms.constant',[])
         warehouse : {    //出库状态
             unprocessed : 10,   //未出库
             execution : 20,   //已出库
-            // haveOutbound : 30,   //进行中
-            // finish : 40 //已完成
+            haveOutbound : 30,   //进行中
+            finish : 40 //已完成
         },
         warehouseName : {    //出库状态 name
             unprocessed : '未出库',
-            execution : '已出库'
-            // haveOutbound : '进行中',
-            // finish : '已完成'
+            execution : '已出库',
+            haveOutbound : '进行中',
+            finish : '已完成'
         },
         defaultDropDownNullData  : {    //空数据
             name : '',
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js
index 71301ff2b1329065aca9f574e04f3e66ee3a57f5..e097af51fa705732463443655ecb5d52cecff916 100644
--- a/routes/resource/base-config.js
+++ b/routes/resource/base-config.js
@@ -1,3 +1,3 @@
-/**Created on 2017-10-20*/
+/**Created on 2017-10-27*/
 
'use strict';
-
module.exports = {"version":"1.0.1","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
+
module.exports = {"version":"1.0.1","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