Преглед изворни кода

分仓申请发货添加未找到机具号提示

DuGuYang пре 3 година
родитељ
комит
6e76fd7cba
1 измењених фајлова са 23 додато и 16 уклоњено
  1. 23 16
      Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

+ 23 - 16
Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -497,28 +497,35 @@ namespace MySystem.Areas.Admin.Controllers
                 BrandId = Convert.ToInt32(Brand);
                 MachineForSnNo posInfo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posInfo.SnId) ?? new PosMachinesTwo();
-                if (pos.Id > 0)
+                if (posInfo.SnId > 0)
                 {
-                    if (pos.BrandId != BrandId)
+                    if (pos.Id > 0)
                     {
-                        error += "以下操作失败" + SnNo + ',' + "该机具品牌填写错误" + '\n';
+                        if (pos.BrandId != BrandId)
+                        {
+                            error += "以下操作失败" + SnNo + ',' + "该机具品牌填写错误" + '\n';
+                        }
                     }
-                }
 
-                if (BrandId == 1) FromStoreId = 7;
-                if (BrandId == 2) FromStoreId = 721;
-                if (BrandId == 3) FromStoreId = 697;
-                if (BrandId == 4) FromStoreId = 774;
-                if (BrandId == 5) FromStoreId = 775;
-                if (BrandId == 6) FromStoreId = 871;
-                if (BrandId == 7) FromStoreId = 1047;
-                if (BrandId == 8) FromStoreId = 4831;
-                if (BrandId == 9) FromStoreId = 4832;
-                if (PosSnList.Contains(SnNo))
+                    if (BrandId == 1) FromStoreId = 7;
+                    if (BrandId == 2) FromStoreId = 721;
+                    if (BrandId == 3) FromStoreId = 697;
+                    if (BrandId == 4) FromStoreId = 774;
+                    if (BrandId == 5) FromStoreId = 775;
+                    if (BrandId == 6) FromStoreId = 871;
+                    if (BrandId == 7) FromStoreId = 1047;
+                    if (BrandId == 8) FromStoreId = 4831;
+                    if (BrandId == 9) FromStoreId = 4832;
+                    if (PosSnList.Contains(SnNo))
+                    {
+                        error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '\n';
+                    }
+                    PosSnList.Add(SnNo);
+                }
+                else
                 {
-                    error += "以下操作失败" + SnNo + ',' + "该机具重复发货" + '\n';
+                    error += "以下操作失败" + SnNo + ',' + "未找到该机具" + '\n';
                 }
-                PosSnList.Add(SnNo);
             }
             if (!string.IsNullOrEmpty(error))
             {