独孤洋\DuGuYang 3 лет назад
Родитель
Сommit
5474a49fb3
1 измененных файлов с 17 добавлено и 16 удалено
  1. 17 16
      Areas/Admin/Controllers/MainServer/SysToolsController.cs

+ 17 - 16
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1597,25 +1597,25 @@ namespace MySystem.Areas.Admin.Controllers
                     string OldSnNum = OldSnList[i];
                     string NewSnNum = NewSnList[i];
                     UserForMakerCode userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
-                    StoreForCode storeForCodeFrom = db.StoreForCode.Any(m => m.Code == FromStoreNo);
-                    if (!storeForCodeFrom)
+                    StoreForCode storeForCodeFrom = db.StoreForCode.FirstOrDefault(m => m.Code == FromStoreNo) ?? new StoreForCode();
+                    if (storeForCodeFrom.StoreId == 0)
                     {
                         return "您输入的新机发货仓库编号不存在";
                     }
-                    StoreForCode storeForCodeBack = db.StoreForCode.Any(m => m.Code == BackStoreNo);
-                    if (!storeForCodeBack)
+                    StoreForCode storeForCodeBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
+                    if (storeForCodeBack.StoreId == 0)
                     {
                         return "您输入的坏机退回仓库编号不存在";
                     }
                     MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
                     MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
-                    PosMachinesTwo oldpos = db.PosMachinesTwo.Any(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId);
-                    if (!oldpos)
+                    PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId) ?? new PosMachinesTwo();
+                    if (oldpos.Id == 0)
                     {
                         return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.Any(m => m.Id == newForSnNo.SnId && m.BindingState == 0);
-                    if (!newpos)
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    if (newpos.Id == 0)
                     {
                         return "您输入的新机SN不存在";
                     }
@@ -1767,25 +1767,25 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         store = db.StoreHouse.FirstOrDefault(m => m.Id == storeForBadCode.StoreId);
                     }
-                    StoreForCode storeForCodeFrom = db.StoreForCode.Any(m => m.Code == FromStoreNo);
-                    if (!storeForCodeFrom)
+                    StoreForCode storeForCodeFrom = db.StoreForCode.FirstOrDefault(m => m.Code == FromStoreNo) ?? new StoreForCode();
+                    if (storeForCodeFrom.StoreId == 0)
                     {
                         return "您输入的新机发货仓库编号不存在";
                     }
-                    StoreForCode storeForCodeBack = db.StoreForCode.Any(m => m.Code == BackStoreNo);
-                    if (!storeForCodeBack)
+                    StoreForCode storeForCodeBack = db.StoreForCode.FirstOrDefault(m => m.Code == BackStoreNo) ?? new StoreForCode();
+                    if (storeForCodeBack.StoreId == 0)
                     {
                         return "您输入的坏机退回仓库编号不存在";
                     }
                     MachineForSnNo oldForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == OldSnNum) ?? new MachineForSnNo();
                     MachineForSnNo newForSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == NewSnNum) ?? new MachineForSnNo();
-                    PosMachinesTwo oldpos = db.PosMachinesTwo.Any(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.StoreId == storeForBadCode.StoreId);
-                    if (!oldpos)
+                    PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.StoreId == storeForBadCode.StoreId) ?? new PosMachinesTwo();
+                    if (oldpos.Id == 0)
                     {
                         return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.Any(m => m.Id == newForSnNo.SnId && m.BindingState == 0);
-                    if (!newpos)
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    if (newpos.Id == 0)
                     {
                         return "您输入的新机SN不存在";
                     }
@@ -1829,6 +1829,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.StoreId = storeBack.Id;
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
+                    // oldpos.Status = -1;
                     db.SaveChanges();
 
                     BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()