调整

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -804,11 +804,11 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入商户编号";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
             }
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);
             if (user == null)
             {
@@ -889,11 +889,11 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入机具SN";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
             }
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             Users user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode);
             if (user == null)
             {

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

@@ -86,7 +86,6 @@
                     success: function (data) {
                         layer.close(index); //关闭弹层
                         if (data == "success") {
-                            layer.close(indexs); //关闭弹层
                             layer.msg('取消成功', {
                                 time: 2000
                             }, function () {

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

@@ -98,7 +98,11 @@
                             window.location.reload();
                         });
                     } else {
-                        layer.msg(data);
+                        layer.msg(data, {
+                            time: 2000
+                        }, function () {
+                            table.reload('LAY-list-manage'); //数据刷新
+                        });
                     }
                 }
             });