Procházet zdrojové kódy

调整机具服务费排除金控的限制

lcl před 1 rokem
rodič
revize
6262955b76

+ 4 - 1
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -6260,11 +6260,14 @@ namespace MySystem.Areas.Admin.Controllers
             }
             }
             var brandId = int.Parse(BrandId);
             var brandId = int.Parse(BrandId);
             List<int> SnIds = new List<int>();
             List<int> SnIds = new List<int>();
+            List<int> BrandIds = new List<int>();
+            BrandIds.Add(1);
+            BrandIds.Add(3);
             string[] PosSnList = PosSn.Replace("\r", "").Replace("\n", ",").Split(',');
             string[] PosSnList = PosSn.Replace("\r", "").Replace("\n", ",").Split(',');
             string error = "";
             string error = "";
             foreach (string Sn in PosSnList)
             foreach (string Sn in PosSnList)
             {
             {
-                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Status > -1 && m.BindingState == 0 && m.ActivationState == 0 && m.PosSn == Sn && m.BrandId == brandId) ?? new PosMachinesTwo();
+                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.Status > -1 && m.BindingState == 0 && !BrandIds.Contains(m.BrandId) && m.ActivationState == 0 && m.PosSn == Sn && m.BrandId == brandId) ?? new PosMachinesTwo();
                 if (posInfo.Id == 0)
                 if (posInfo.Id == 0)
                 {
                 {
                     error += "以下操作失败" + Sn + ',' + "不存在或者不符合条件" + '\n';
                     error += "以下操作失败" + Sn + ',' + "不存在或者不符合条件" + '\n';