Ling
/
EPLAN_PROD_Plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Clean code

This commit is contained in:
lihanbo 2024-10-25 08:40:22 +08:00
parent f2cd6c50b2
commit ea543c8992
1 changed files with 16 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
View File

@ -176,133 +176,30 @@ public partial class MainViewModel : INotifyPropertyChanged
); );
return Task.FromResult(reportDatas.ToList()); return Task.FromResult(reportDatas.ToList());
} }
public void LoadReportData(IEnumerable<BaseReportEntry> data, List<ReportColumn> columns)
{
DataColumns = [];
//foreach (var column in columns)
//{
// //Trace.WriteLine($"/// {column.Text}\r\n public string {column.ID} {{get;set;}} ");
// DataColumns.Add(new DataGridTextColumn()
// {
// Header = column.Text,
// Binding = new System.Windows.Data.Binding(column.ID)
// });
//}
//DataColumns.Add(new DataGridTextColumn()
//{
// Header = "变色管信息",
// Binding = new System.Windows.Data.Binding("DiscolorationDesc")
//});
//Data = [];
//var reportDatas = new ConcurrentBag<ReportModel>();
////foreach (var entry in data)
//data.AsParallel().WithDegreeOfParallelism(8).ForAll(entry =>
// {
// var obj = new ReportModel();
// foreach (var column in columns)
// {
// if (!entry.Properties.ContainsKey(column.ColumnID)) continue;
// var value = entry.Properties[column.ColumnID].GetDisplayValue();
// var property = typeof(ReportModel).GetProperty(column.ID);
// if (property != null)
// {
// property.SetValue(obj, value ?? "");
// }
// }
// reportDatas.Add(obj);
// }
//);
//if (reportDatas != null && reportDatas.Any())
//{
// reportDatas.ToList().ForEach(Data.Add);
//}
//UpdateDataGridColumns([.. DataColumns], DataGridType.Originial);
//StuffedData = [];
//StuffData().ForEach(item =>
//{
// if (item != null)
// {
// StuffedData.Add(item);
// }
//});
//OnPropertyChanged(nameof(StuffedDatas));
}
public async Task<List<StuffedDataModel>> StuffData(List<ReportModel> data) public async Task<List<StuffedDataModel>> StuffData(List<ReportModel> data)
{ {
var datas = new ConcurrentBag<StuffedDataModel>(); var datas = new ConcurrentBag<StuffedDataModel>();
var isAllCe = true; //var isAllCe = true;
var isL1 = false; //var isL1 = false;
var isL2 = false; //var isL2 = false;
var isL3 = false; //var isL3 = false;
var isPe = false; //var isPe = false;
//foreach (var item in Data) //foreach (var item in Data)
data.AsParallel().WithDegreeOfParallelism(8).ForAll(item => data.AsParallel().WithDegreeOfParallelism(8).ForAll(item =>
{ {
try try
{ {
if (item == null) return; if (item == null) return;
//var data = item.MemoryClone<ReportModel>();
//new ReportModel
//{
// Project = item.Project,
// Document = item.Document,
// CableName = item.CableName,
// PartNumber = item.PartNumber,
// ManufacturerCompany = item.ManufacturerCompany,
// Imprint = item.Imprint,
// Length = item.Length,
// OutsideDiameter = item.OutsideDiameter,
// CoreDiameter = item.CoreDiameter,
// ERPNr = item.ERPNr,
// DisplayColor = item.DisplayColor,
// DisplayStripeColor = item.DisplayStripeColor,
// WireName = item.WireName,
// WireTwisted = item.WireTwisted,
// ConnectorFrom = item.ConnectorFrom,
// ConnectorFromERPNr = item.ConnectorFromERPNr,
//};
var data = new StuffedDataModel(); var data = new StuffedDataModel();
if (!string.IsNullOrEmpty(item.PartNumber)) //if (!string.IsNullOrEmpty(item.PartNumber))
{ //{
if (!item.PartNumber.Contains("-CE／")) // if (!item.PartNumber.Contains("-CE／"))
{ // {
isAllCe = false; // isAllCe = false;
} // }
} //}
if (!string.IsNullOrEmpty(item.Imprint))
{
if (item.Imprint.StartsWith("L1"))
{
isL1 = true;
}
if (item.Imprint.StartsWith("L2"))
{
isL2 = true;
}
if (item.Imprint.StartsWith("L3"))
{
isL3 = true;
}
if (item.Imprint.StartsWith("PE"))
{
isPe = true;
}
}
if (!string.IsNullOrEmpty(item.Imprint) && item.Imprint.Contains("&")) if (!string.IsNullOrEmpty(item.Imprint) && item.Imprint.Contains("&"))
{ {
var splitImprint = item.Imprint.Split('&'); var splitImprint = item.Imprint.Split('&');
@ -396,10 +293,10 @@ public partial class MainViewModel : INotifyPropertyChanged
}); });
IsRequireCe = isAllCe; //IsRequireCe = isAllCe;
IsUseDiscoloration = isL1 && isL2 && isL3 && isPe; //IsUseDiscoloration = isL1 && isL2 && isL3 && isPe;
Trace.WriteLine($"isAllCE: {isAllCe}"); //Trace.WriteLine($"isAllCE: {isAllCe}");
Trace.WriteLine($"isSDIProject: {isL1 && isL2 && isL3 && isPe}"); //Trace.WriteLine($"isSDIProject: {isL1 && isL2 && isL3 && isPe}");
return await Task.FromResult<List<StuffedDataModel>>([.. datas]); return await Task.FromResult<List<StuffedDataModel>>([.. datas]);
} }
/// <summary> /// <summary>