diff --git a/PDA/PDA/config.js b/PDA/PDA/config.js
index cba66ce..9c01dd2 100644
--- a/PDA/PDA/config.js
+++ b/PDA/PDA/config.js
@@ -10,7 +10,7 @@ export function getConfig(key, defaultValue) {
 }
 
 export function getServerIPAndPort() {
-    var serverIP = getConfig('serverIP', '192.168.18.153');
+    var serverIP = getConfig('serverIP', '192.168.18.200');
     var serverPort = getConfig('serverPort', '8888');
 	return serverIP + ':' + serverPort;
 }
\ No newline at end of file
diff --git a/PDA/PDA/pages/config/config.vue b/PDA/PDA/pages/config/config.vue
index c82a223..54f2e99 100644
--- a/PDA/PDA/pages/config/config.vue
+++ b/PDA/PDA/pages/config/config.vue
@@ -31,7 +31,7 @@
 			};
 		},
 		onLoad:function() {
-			this.serverIP = getConfig('serverIP', '192.168.18.153');
+			this.serverIP = getConfig('serverIP', '192.168.18.200');
 			this.serverPort = getConfig('serverPort', '8888');
 		},
 		methods: {
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index 5e0eb15..dadd505 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -147,7 +147,7 @@ if (uni.restoreGlobal) {
     return uni.getStorageSync(key) || defaultValue;
   }
   function getServerIPAndPort() {
-    var serverIP = getConfig("serverIP", "192.168.18.153");
+    var serverIP = getConfig("serverIP", "192.168.18.200");
     var serverPort = getConfig("serverPort", "8888");
     return serverIP + ":" + serverPort;
   }
@@ -332,7 +332,7 @@ if (uni.restoreGlobal) {
       };
     },
     onLoad: function() {
-      this.serverIP = getConfig("serverIP", "192.168.18.153");
+      this.serverIP = getConfig("serverIP", "192.168.18.200");
       this.serverPort = getConfig("serverPort", "8888");
     },
     methods: {
diff --git a/WCS.BLL/Services/Service/PDAMatBindService.cs b/WCS.BLL/Services/Service/PDAMatBindService.cs
index 8a1a948..77b4fa3 100644
--- a/WCS.BLL/Services/Service/PDAMatBindService.cs
+++ b/WCS.BLL/Services/Service/PDAMatBindService.cs
@@ -203,6 +203,7 @@ namespace WCS.BLL.Services.Service
                                                  .Where((li, si) => li.LocationAreaId == request.SendBackLocationAreaId)
                                                  .Where((li, si) => li.IsEnable == true)
                                                  .Where((li, si) => li.Id != shelf.CurrentLocationId)
+                                                 .Where((li, si) => si.Id == null)
                                                  .Select((li, si) => li)
                                                  .FirstAsync();
                 if (endLocation == null)
diff --git a/WCS.BLL/Services/Service/UserService.cs b/WCS.BLL/Services/Service/UserService.cs
index ec572be..7ec3c80 100644
--- a/WCS.BLL/Services/Service/UserService.cs
+++ b/WCS.BLL/Services/Service/UserService.cs
@@ -119,7 +119,7 @@ namespace WCS.BLL.Services.Service
                     {
                         var newUser = new UserBase()
                         {
-                            LoginName = request.User.LoginName,
+                            LoginName = request.User.LoginName.ToLower(),
                             Password = request.User.Password,
                             RoleIds = request.User.RoleIds,
                             IsAdmin = request.User.IsAdmin,
@@ -452,7 +452,7 @@ namespace WCS.BLL.Services.Service
                     //#endregion
                     if (user == null)
                         user = await AuthDbHelp.db.Queryable<UserBase>()
-                                 .Where(t => t.LoginName == request.UserName)
+                                 .Where(t => t.LoginName == request.UserName.ToLower())
                                  .FirstAsync();
                     if (user == null)
                     {
diff --git a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs
index ddb115d..c689de0 100644
--- a/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs
+++ b/WCS.WebApi/Controllers/PDAProductionLineCallOutController.cs
@@ -377,6 +377,8 @@ namespace WCS.WebApi.Controllers
                                                  .LeftJoin<ShelfInfo>((li, si) => (li.Id == si.CurrentLocationId && si.TransStatus == TransStatusEnum.静止) || (li.Id == si.DestinationLocationId && si.TransStatus == TransStatusEnum.运输中))
                                                  .Where((li, si) => li.LocationAreaId == request.DestinationLocationAreaId)
                                                  .Where((li, si) => li.IsEnable == true)
+                                                 .Where((li, si) => li.Id != shelfInfo.CurrentLocationId)
+                                                 .Where((li, si) => si.Id == null)
                                                  .Select((li, si) => li)
                                                  .FirstAsync();
                 if (endLocation == null)