完成，待测试

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -2109,6 +2109,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)
+                {
+                    return "原机具和新机具不是同种机型(电签或大POS)";
+                }
                 if (brandInfo.Name.Contains("大POS"))
                 {
                     amount = 300;
@@ -2222,39 +2227,6 @@ namespace MySystem.Areas.Admin.Controllers
                 PublicFunction.ClearPosHistory(db, oldpos.PosSn); //清除机具历史记录
                 db.SaveChanges();
                 opdb.SaveChanges();
-
-                PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == newpos.BindMerchantId);
-                if (merchant != null)
-                {
-                    merchant.KqSnNo = newpos.PosSn;
-                    merchant.ActiveStatus = newpos.ActivationState;
-                }
-                db.SaveChanges();
-
-                BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()
-                {
-                    CreateDate = DateTime.Now,
-                    CreateMan = SysUserName + "-" + SysRealName,
-                    ChangeNo = "BPC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3), //转换单号
-                    OutStoreId = storeFrom.Id,
-                    BackStoreId = storeBack.Id,
-                    OutProductType = newpos.BrandId,
-                    BackProductType = oldpos.BrandId,
-                    UserId = userForMakerCode.UserId, //创客
-                }).Entity;
-                db.SaveChanges();
-                BrokenMachineChangeDetail adds = db.BrokenMachineChangeDetail.Add(new BrokenMachineChangeDetail()
-                {
-                    CreateDate = DateTime.Now,
-                    CreateMan = SysUserName + "-" + SysRealName,
-                    OutSnNo = OldSnNum,
-                    BackSnNo = NewSnNum,
-                    ChangeNo = add.ChangeNo, //转换单号
-                    ChangeId = add.Id, //转换记录Id
-                    UserId = add.UserId, //创客
-                }).Entity;
-                db.SaveChanges();
-                var oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 if (IsSend == 1)
                 {
                     RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
@@ -2262,7 +2234,7 @@ namespace MySystem.Areas.Admin.Controllers
                         UserId = userForMakerCode.UserId, //接收创客
                         MsgType = 2,
                         Title = "创客跨品牌换机", //标题
-                        Summary = "您的旧机 " + oldPosBrand.Name + " SN:" + OldSnNum + "已经成功为您换为" + oldPosBrand.Name + "SN:" + NewSnNum + "。",
+                        Summary = "您的旧机 " + brandInfo.Name + " SN:" + OldSnNum + "已经成功为您换为" + brandNew.Name + "SN:" + NewSnNum + "。",
                         CreateDate = DateTime.Now,
 
                     }));