调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -3588,6 +3588,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
+                pos.UpdateDate = DateTime.Now;
                 pos.BindMerchantId = posMerchant.Id;
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "根据机具号、商户号、商户姓名关联");
@@ -3684,6 +3685,7 @@ namespace MySystem.Areas.Admin.Controllers
             var user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == FromMakerCode) ?? new UserForMakerCode();
             var tuser = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ToMakerCode) ?? new UserForMakerCode();
             var fUserId = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
+            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             var machineForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == PosSn) ?? new MachineForSnNo();
             var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineForSnNo.SnId && m.BuyUserId == user.UserId) ?? new PosMachinesTwo();
             if (posInfo.Id == 0)
@@ -3694,18 +3696,21 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "来源创客" + FromMakerCode + "不存在";
             }
-            var tUserId = db.Users.FirstOrDefault(m => m.Id == tuser.UserId) ?? new Users();
             if (tUserId.Id == 0)
             {
                 return "划拨创客" + ToMakerCode + "不存在";
             }
             if (posInfo.BindingState == 0)
             {
-                posInfo.BuyUserId = tUserId.Id;
-                if (posInfo.UserId == 0)
+                if (posInfo.UserId == 0 || posInfo.BuyUserId == posInfo.UserId)
                 {
+                    posInfo.BuyUserId = tUserId.Id;
                     posInfo.UserId = tUserId.Id;
                 }
+                else
+                {
+                    posInfo.BuyUserId = tUserId.Id;
+                }
                 db.SaveChanges();
                 function.WriteLog(DateTime.Now.ToString() + ":请求参数，" + query + ":" + SysUserName + "-" + SysRealName, "划拨创客机具");
             }

Areas/Admin/Views/MainServer/SysTools/TransferPos.cshtml

@@ -87,7 +87,7 @@
             }
             else {
                 var index = layer.confirm('确定要划拨吗？', function (index) {
-                    var index = layer.load(1, {
+                    var indexs = layer.load(1, {
                         shade: [0.5, '#000']
                     });
                     var userdata = $("#confirmFrm").serialize();