换机规则调整，大机可以换电签

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1767,6 +1767,10 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+
+
+
         #region 更换机具
 
         public IActionResult ChangePos(string right)
@@ -1852,6 +1856,10 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
+                if (oldPosBrand.Kind != newPosBrand.Kind && oldPosBrand.Kind == 1)
+                {
+                    return "电签不能兑换大POS";
+                }
                 PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
                 if (merchant == null)
                 {
@@ -1946,6 +1954,7 @@ namespace MySystem.Areas.Admin.Controllers
                 oldpos.Status = -1;
                 newpos.FirstFlag = oldpos.FirstFlag;
                 newpos.IsExecute = oldpos.IsExecute;
+                newpos.OpId = oldpos.OpId;
 
                 //对应调整客小爽企业版数据
                 var posInfo = db.BusinessPartnerPos.FirstOrDefault(m => m.PosId == oldpos.Id);
@@ -2022,7 +2031,6 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-
         #region 坏机换新
 
         public IActionResult ChangeBadPos(string right)
@@ -2117,6 +2125,11 @@ namespace MySystem.Areas.Admin.Controllers
                         return "您输入的新机发货仓库和坏机退回仓库品牌类型不同";
                     }
                     var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                    var brandNew = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
+                    if (brandInfo.Kind != brandNew.Kind && brandInfo.Kind == 1)
+                    {
+                        return "电签不能兑换大POS";
+                    }
                     if (brandInfo.Name.Contains("大POS"))
                     {
                         amount = 300;
@@ -2607,7 +2620,6 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
-
         #region 创客跨品牌换机
 
         public IActionResult ChangePosCrossBrand(string right)
@@ -2710,9 +2722,9 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 var brandNew = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
-                if (brandInfo.Kind != brandNew.Kind)
+                if (brandInfo.Kind != brandNew.Kind && brandInfo.Kind == 1)
                 {
-                    return "原机具和新机具不是同种机型(电签或大POS)";
+                    return "电签不能兑换大POS";
                 }
                 if (brandInfo.Name.Contains("大POS"))
                 {
@@ -2949,6 +2961,9 @@ namespace MySystem.Areas.Admin.Controllers
 
 
 
+
+
+
         #region 机具解绑
 
         public IActionResult Unbind(string right)