105040 Update 增加叉耳端子检查
This commit is contained in:
parent
faa4bbf20d
commit
f2cd6c50b2
|
@ -41,6 +41,18 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
|||
[ExcelColumn(Name = "号码管物料编码")]
|
||||
public string TubeMaterialCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 扁形端子
|
||||
/// </summary>
|
||||
[ExcelColumn(Name = "叉耳端子")]
|
||||
public string ForkTerminal { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 扁形端子物料编码
|
||||
/// </summary>
|
||||
[ExcelColumn(Name = "叉耳端子物料编码")]
|
||||
public string ForkTerminalMaterialCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 扁形端子
|
||||
/// </summary>
|
||||
|
|
|
@ -159,6 +159,8 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
|
|||
if (!excelModels.Any()) return terminals;
|
||||
foreach (var item in excelModels)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item.ForkTerminal))
|
||||
terminals.Add(item.ForkTerminal);
|
||||
if (!string.IsNullOrEmpty(item.FlatTerminal))
|
||||
terminals.Add(item.FlatTerminal);
|
||||
if (!string.IsNullOrEmpty(item.PinTerminal))
|
||||
|
@ -179,14 +181,17 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel
|
|||
("R", WireFlagType.Single, "褐色"),
|
||||
("L1", WireFlagType.Mix, "褐色"),
|
||||
("R", WireFlagType.Mix, "褐色"),
|
||||
|
||||
("L2", WireFlagType.Dual, "黑色"),
|
||||
("S", WireFlagType.Single, "黑色"),
|
||||
("L2", WireFlagType.Mix, "黑色"),
|
||||
("S", WireFlagType.Mix, "黑色"),
|
||||
|
||||
("L3", WireFlagType.Dual, "灰色"),
|
||||
("T", WireFlagType.Single, "灰色"),
|
||||
("L3", WireFlagType.Mix, "灰色"),
|
||||
("T", WireFlagType.Mix, "灰色"),
|
||||
|
||||
("PE", null, "绿色")
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue