From 4521320d11167b87a4929dc6deac95e52d261070 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 07 六月 2024 14:47:10 +0800
Subject: [PATCH] 优化获取车轮数据
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs | 14 ++++----------
代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs | 4 +---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs | 4 +---
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs"
index 75c32e3..87113ed 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/equipment/GetWheelDate.cs"
@@ -14,8 +14,9 @@
/// <summary>
/// 鑾峰彇杞﹁疆鏁版嵁
/// </summary>
- public static void GetWheelDate(PLCClient client)
+ public static List<WheelDBItem> GetWheelDate(PLCClient client)
{
+ List<WheelDBItem> wheelDBItems = new List<WheelDBItem>();
PropertyInfo[] propertyInfos = typeof(WheelDBItem).GetProperties();
var groups = client.itemGroups.OrderBy(x => x.Methods).ThenBy(x => x.name).GroupBy(x => x.Methods).ToList();
foreach (var key in groups)
@@ -51,16 +52,9 @@
}
}
}
- switch (client.PLCName)
- {
- case "VK4":
- WheelDBItem.VK4WheelDBItem.Add(StackerDBItem);
- break;
- case "VK5":
- WheelDBItem.VK5WheelDBItem.Add(StackerDBItem);
- break;
- }
+ wheelDBItems.Add(StackerDBItem);
}
+ return wheelDBItems;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
index e5f1b95..616ce49 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
@@ -39,9 +39,7 @@
client.Connect();
return;
}
-
- WheelDBItem.VK4WheelDBItem = new List<WheelDBItem>();
- GetDate.GetWheelDate(client);
+ WheelDBItem.VK4WheelDBItem = GetDate.GetWheelDate(client);
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
index d41b9b6..171d61d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
@@ -35,9 +35,7 @@
client.Connect();
return;
}
-
- WheelDBItem.VK5WheelDBItem = new List<WheelDBItem>();
- GetDate.GetWheelDate(client);
+ WheelDBItem.VK5WheelDBItem = GetDate.GetWheelDate(client);
}
}
}
--
Gitblit v1.9.3