Browse Source

boat slot统计 非空bug

jiangjy 3 weeks ago
parent
commit
5873d70360

+ 2 - 2
Furnace/FurnaceUI/Views/Operations/TransferMain/BoatModifyViewModel.cs

@@ -39,7 +39,7 @@ namespace FurnaceUI.Views.Operations
         public List<string> OriginModuleItems { get; set; } = new List<string>();
         public bool IsPermission { get => this.Permission == 3; }
 
-        public bool IsEnableManualOperation => IsPermission&&RtStatus != "AutoRunning";
+        public bool IsEnableManualOperation => IsPermission && RtStatus != "AutoRunning";
         private int? _boatSlotFrom = 1;
         public int? BoatSlotFrom
         {
@@ -236,7 +236,7 @@ namespace FurnaceUI.Views.Operations
                 UpperSDNum = BoatMapWafers.Where(x => x == "SD").Count();
                 LowerSDNum = BoatMapWafers.Where(x => x == "ED").Count();
 
-                ProductNum = BoatMapWafers.Where(x => x.StartsWith("P")).Count();
+                ProductNum = BoatMapWafers.Where(x => !string.IsNullOrEmpty(x) && x.StartsWith("P")).Count();
                 MonitorNum1 = BoatMapWafers.Where(x => x == "M1").Count();
                 MonitorNum2 = BoatMapWafers.Where(x => x == "M2").Count();
             }

+ 1 - 1
Furnace/FurnaceUI/Views/Recipes/RecipeLayoutEditViewModel.cs

@@ -619,7 +619,7 @@ namespace FurnaceUI.Views.Recipes
                 UpperSDNum = listWafers.Where(x => x == "SD").Count();
                 LowerSDNum = listWafers.Where(x => x == "FD").Count();
 
-                ProductNum = listWafers.Where(x => x.StartsWith("P")).Count();
+                ProductNum = listWafers.Where(x => !string.IsNullOrEmpty(x) && x.StartsWith("P")).Count();
                 MonitorNum1 = listWafers.Where(x => x == "M1").Count();
                 MonitorNum2 = listWafers.Where(x => x == "M2").Count();
             }