Преглед на файлове

修复设置首台机具功能

DuGuYang преди 3 години
родител
ревизия
cc0a3cb104
променени са 1 файла, в които са добавени 22 реда и са изтрити 12 реда
  1. 22 12
      Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

+ 22 - 12
Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -1153,28 +1153,38 @@ namespace MySystem.Areas.Admin.Controllers
             var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn) ?? new PosMachinesTwo();
             var thisdate = pos.BindingTime;
             var otherdate = pos.BindingTime;
-            var changeFlag = 0;
-            foreach (var item in posMerchants)
+            if (posMerchants.Count > 0)
             {
-                Dictionary<string, object> curData = new Dictionary<string, object>();
-                var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item.KqSnNo) ?? new PosMachinesTwo();
-                otherdate = posInfo.BindingTime;
-                if (thisdate < otherdate)
+                var flag = 0;
+                foreach (var item in posMerchants)
                 {
-                    changeFlag = 1;
-                    posInfo.IsFirst = 0;
+                    var changeFlag = 0;
+                    Dictionary<string, object> curData = new Dictionary<string, object>();
+                    var posInfo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == item.KqSnNo) ?? new PosMachinesTwo();
+                    otherdate = posInfo.BindingTime;
+                    if (thisdate <= otherdate)
+                    {
+                        changeFlag = 1;
+                        posInfo.IsFirst = 0;
+                        flag = changeFlag;
+                    }
+                    else
+                    {
+                        return "不符合设置条件";
+                    }
                 }
-                else
+                if (flag == 1)
                 {
-                    return "不符合设置条件";
+                    AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
+                    pos.IsFirst = 1;
                 }
             }
-            if (changeFlag == 1)
+            else
             {
                 AddSysLog(PosSn, "PosMachinesTwo", "SetFirstPos");
                 pos.IsFirst = 1;
-                db.SaveChanges();
             }
+            db.SaveChanges();
             return "success";
         }
         #endregion