105040 Update 线材检查使用ID作为标识判断
This commit is contained in:
parent
1fc8ba3603
commit
efca568200
|
@ -2,6 +2,9 @@
|
||||||
{
|
{
|
||||||
public class ReportModel : CheckedModel
|
public class ReportModel : CheckedModel
|
||||||
{
|
{
|
||||||
|
public string OccPartId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// 项目
|
/// 项目
|
||||||
public string Project { get; set; }
|
public string Project { get; set; }
|
||||||
/// 归属机构
|
/// 归属机构
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
using EPLAN.Harness.PlatformCore.P8Objects;
|
||||||
|
|
||||||
|
namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
线色
|
线色
|
||||||
|
@ -23,6 +25,7 @@
|
||||||
public StuffedDataModel()
|
public StuffedDataModel()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
public string OccPartId { get; set; }
|
||||||
|
|
||||||
private string wireColor;
|
private string wireColor;
|
||||||
private string wireModel;
|
private string wireModel;
|
||||||
|
|
|
@ -364,7 +364,7 @@ public partial class MainWindow : System.Windows.Window
|
||||||
StuffedDataModel item = (StuffedDataModel)selectItems[0];
|
StuffedDataModel item = (StuffedDataModel)selectItems[0];
|
||||||
if (item != null)
|
if (item != null)
|
||||||
{
|
{
|
||||||
var repoetEntry = datas.FirstOrDefault(it => it.Properties["WireName"].ValueString() == item.WireName);
|
var repoetEntry = datas.FirstOrDefault(it => it.ID == item.OccPartId);
|
||||||
_report.DataSources.GetSources();
|
_report.DataSources.GetSources();
|
||||||
if (repoetEntry.OrigDocIDs == null || repoetEntry.OrigDocIDs.Count == 0)
|
if (repoetEntry.OrigDocIDs == null || repoetEntry.OrigDocIDs.Count == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -260,6 +260,7 @@ public partial class MainViewModel : INotifyPropertyChanged
|
||||||
property?.SetValue(obj, value ?? "");
|
property?.SetValue(obj, value ?? "");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
obj.OccPartId = entry.ID;
|
||||||
reportDatas.Add(obj);
|
reportDatas.Add(obj);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -288,6 +289,7 @@ public partial class MainViewModel : INotifyPropertyChanged
|
||||||
|
|
||||||
var data = new StuffedDataModel();
|
var data = new StuffedDataModel();
|
||||||
|
|
||||||
|
data.OccPartId = item.OccPartId;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(item.Imprint) && item.Imprint.Contains("&"))
|
if (!string.IsNullOrEmpty(item.Imprint) && item.Imprint.Contains("&"))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue