From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 10:50:24 +0800
Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中,修改了多个任务查询方法,现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时,移除了不再需要的注释代码行。

---
 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs
index 03e8283..781918a 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs
@@ -21,6 +21,22 @@
 
         public static T DicToModel<T>(this Dictionary<string, object> dic)
         {
+            //T model = Activator.CreateInstance<T>();
+            //PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
+
+            //Dictionary<string, object> upperDic = dic.ToDictionary(k => k.Key.ToUpper(), v => v.Value);
+
+            //foreach (var property in propertyInfos)
+            //{
+            //    object value = null;
+            //    if (!upperDic.TryGetValue(property.Name.ToUpper(), out value))
+            //    {
+            //        continue;
+            //    }
+            //    property.SetValue(model, value?.ToString().ChangeType(property.PropertyType));
+            //}
+            //return model;
+
             T model = Activator.CreateInstance<T>();
             PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
             foreach (var property in propertyInfos)
@@ -35,10 +51,12 @@
                             continue;
                         }
                     }
-                };
+                }
+                ;
                 property.SetValue(model, value?.ToString().ChangeType(property.PropertyType));
             }
             return model;
+
         }
     }
 }

--
Gitblit v1.9.3