From 1b6ccb64675e5262a2f7135697edc7466ffc14bf Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 04 三月 2025 17:20:05 +0800
Subject: [PATCH] 优化
---
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue | 4 ++--
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 22 +++++++++++-----------
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs | 10 +++++-----
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs | 13 +++++--------
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 4 ++--
5 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
index eef3336..015c106 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
@@ -33,7 +33,7 @@
stacker: "",
executionMethod:"",
platformType:"",
- pLCCode:"",
+ plcCode:"",
location: "",
capacity: "",
status: "",
@@ -59,7 +59,7 @@
stacker: "",
executionMethod:"",
platformType:"",
- pLCCode:"",
+ plcCode:"",
location: "",
capacity: "",
status: "",
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index df216d1..c22340f 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -32,7 +32,7 @@
roadway: "",
taskType:"",
taskState:"",
- wMSId:"",
+ wmsId:"",
sourceAddress: "",
targetAddress: "",
currentAddress: "",
@@ -193,7 +193,7 @@
align: "left",
},
{
- field: "wMSId",
+ field: "wmsId",
title: "WMS浠诲姟涓婚敭",
type: "int",
width: 120,
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..4dbd56f 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/ObjectExtension.cs
@@ -23,18 +23,15 @@
{
T model = Activator.CreateInstance<T>();
PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
+
+ Dictionary<string, object> upperDic = dic.ToDictionary(x => x.Key.ToUpper(), y => y.Value);
+
foreach (var property in propertyInfos)
{
object value = null;
- if (!dic.TryGetValue(property.Name, out value))
+ if (!upperDic.TryGetValue(property.Name.ToUpper(), out value))
{
- if (!dic.TryGetValue(property.Name.FirstLetterToUpper(), out value))
- {
- if (!dic.TryGetValue(property.Name.FirstLetterToLower(), out value))
- {
- continue;
- }
- }
+ continue;
};
property.SetValue(model, value?.ToString().ChangeType(property.PropertyType));
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
index 91dacd8..11ea985 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
@@ -173,11 +173,11 @@
if (sugarColumn == null)
return "璇烽厤缃甋ugarColumn灞炴��";
//蹇界暐涓庝富閿殑瀛楁涓嶅仛楠岃瘉
- if (property.Name == keyName.FirstLetterToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
+ if (property.Name.ToUpper() == keyName.ToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
continue;
//涓嶅湪缂栬緫涓殑鍒楋紝鏄惁涔熻蹇呭～
- if (!dic.ContainsKey(property.Name.FirstLetterToLower()))
+ if (!dic.ContainsKey(property.Name.ToUpper()))
{
if (!sugarColumn.IsNullable)
{
@@ -187,12 +187,12 @@
}
continue;
}
- if(dic[property.Name.FirstLetterToLower()] != null)
+ if(dic[property.Name.ToUpper()] != null)
{
- string str = dic[property.Name.FirstLetterToLower()].ToString();
+ string str = dic[property.Name.ToUpper()].ToString();
//灏嗘墍鏈夌┖鍊艰缃负null
if (str == string.Empty)
- dic[property.Name.FirstLetterToLower()] = null;
+ dic[property.Name.ToUpper()] = null;
}
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
index 0caccd8..d6e99c9 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
@@ -42,7 +42,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鍙�")]
[ExporterHeader(DisplayName = "浠诲姟鍙�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
public int TaskNum { get; set; }
/// <summary>
@@ -50,7 +50,7 @@
/// </summary>
[ImporterHeader(Name = "鎵樼洏缂栧彿")]
[ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
public string PalletCode { get; set; }
/// <summary>
@@ -58,7 +58,7 @@
/// </summary>
[ImporterHeader(Name = "宸烽亾鍙�")]
[ExporterHeader(DisplayName = "宸烽亾鍙�")]
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鍙�")]
+ [SugarColumn(IsNullable = true, Length = 10, ColumnDescription = "宸烽亾鍙�")]
public string Roadway { get; set; }
/// <summary>
@@ -66,7 +66,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟绫诲瀷")]
[ExporterHeader(DisplayName = "浠诲姟绫诲瀷")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟绫诲瀷")]
public int TaskType { get; set; }
/// <summary>
@@ -74,7 +74,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鐘舵��")]
[ExporterHeader(DisplayName = "浠诲姟鐘舵��")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鐘舵��")]
public int TaskState { get; set; }
/// <summary>
@@ -82,7 +82,7 @@
/// </summary>
[ImporterHeader(Name = "璧峰鍦板潃")]
[ExporterHeader(DisplayName = "璧峰鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璧峰鍦板潃")]
public string SourceAddress { get; set; }
/// <summary>
@@ -90,7 +90,7 @@
/// </summary>
[ImporterHeader(Name = "鐩爣鍦板潃")]
[ExporterHeader(DisplayName = "鐩爣鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
public string TargetAddress { get; set; }
/// <summary>
@@ -98,7 +98,7 @@
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
[ExporterHeader(DisplayName = "褰撳墠浣嶇疆")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
public string CurrentAddress { get; set; }
/// <summary>
@@ -106,7 +106,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬩竴鍦板潃")]
[ExporterHeader(DisplayName = "涓嬩竴鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
public string NextAddress { get; set; }
/// <summary>
@@ -122,7 +122,7 @@
/// </summary>
[ImporterHeader(Name = "浼樺厛绾�")]
[ExporterHeader(DisplayName = "浼樺厛绾�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浼樺厛绾�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浼樺厛绾�")]
public int Grade { get; set; }
/// <summary>
@@ -130,7 +130,7 @@
/// </summary>
[ImporterHeader(Name = "WMS浠诲姟涓婚敭")]
[ExporterHeader(DisplayName = "WMS浠诲姟涓婚敭")]
- [SugarColumn(IsNullable = false, ColumnDescription = "WMS浠诲姟涓婚敭")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "WMS浠诲姟涓婚敭")]
public int WMSId { get; set; }
/// <summary>
--
Gitblit v1.9.3