|
@@ -25,19 +25,19 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
/// <summary>
|
|
/// <summary>
|
|
/// WinManufacturer.xaml 的交互逻辑
|
|
/// WinManufacturer.xaml 的交互逻辑
|
|
/// </summary>
|
|
/// </summary>
|
|
- public partial class WinManufacturer: INotifyPGUpdate,INotifyPropertyChanged
|
|
|
|
|
|
+ public partial class WinManufacturer : INotifyPGUpdate, INotifyPropertyChanged
|
|
{
|
|
{
|
|
public WinManufacturer()
|
|
public WinManufacturer()
|
|
{
|
|
{
|
|
InitializeComponent();
|
|
InitializeComponent();
|
|
this.Loaded += WinManufacturer_Loaded;
|
|
this.Loaded += WinManufacturer_Loaded;
|
|
- m_Venders=new ObservableCollection<MManufacturer>();
|
|
|
|
|
|
+ m_Venders = new ObservableCollection<MManufacturer>();
|
|
}
|
|
}
|
|
private MEquipment m_MEquipment;
|
|
private MEquipment m_MEquipment;
|
|
private List<MManufacturer> BaseVenders { get; set; }
|
|
private List<MManufacturer> BaseVenders { get; set; }
|
|
- public WinManufacturer(MEquipment equipment):this()
|
|
|
|
|
|
+ public WinManufacturer(MEquipment equipment) : this()
|
|
{
|
|
{
|
|
- m_MEquipment = equipment;
|
|
|
|
|
|
+ m_MEquipment = equipment;
|
|
}
|
|
}
|
|
|
|
|
|
private void WinManufacturer_Loaded(object sender, RoutedEventArgs e)
|
|
private void WinManufacturer_Loaded(object sender, RoutedEventArgs e)
|
|
@@ -65,7 +65,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
set
|
|
set
|
|
{
|
|
{
|
|
m_Venders = value;
|
|
m_Venders = value;
|
|
- PropertyChanged?.Invoke(this,new PropertyChangedEventArgs(nameof(Venders)));
|
|
|
|
|
|
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Venders)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -79,7 +79,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
set
|
|
set
|
|
{
|
|
{
|
|
m_CurrentVender = value;
|
|
m_CurrentVender = value;
|
|
- PropertyChanged?.Invoke(this,new PropertyChangedEventArgs(nameof(CurrentVender)));
|
|
|
|
|
|
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentVender)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -107,7 +107,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
main.ShowDialog();
|
|
main.ShowDialog();
|
|
InitData();
|
|
InitData();
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
/// <summary>
|
|
/// <summary>
|
|
/// 修改型号
|
|
/// 修改型号
|
|
@@ -138,7 +138,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
main.ShowDialog();
|
|
main.ShowDialog();
|
|
InitData();
|
|
InitData();
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
private void SearchInputEditor_Click(object sender, RoutedEventArgs e)
|
|
private void SearchInputEditor_Click(object sender, RoutedEventArgs e)
|
|
{
|
|
{
|
|
@@ -161,7 +161,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
Venders = new ObservableCollection<MManufacturer>(newList);
|
|
Venders = new ObservableCollection<MManufacturer>(newList);
|
|
|
|
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
private void BtnSaveChange_OnClick(object sender, RoutedEventArgs e)
|
|
private void BtnSaveChange_OnClick(object sender, RoutedEventArgs e)
|
|
{
|
|
{
|
|
@@ -185,7 +185,7 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
{
|
|
{
|
|
if (obj is Property property)
|
|
if (obj is Property property)
|
|
property.Value = GetValueDisplay(item);
|
|
property.Value = GetValueDisplay(item);
|
|
- }
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
{
|
|
{
|
|
@@ -198,15 +198,19 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
private static ManufacturerUpdateItem InitUpdateItem(MManufacturer showItem)
|
|
private static ManufacturerUpdateItem InitUpdateItem(MManufacturer showItem)
|
|
{
|
|
{
|
|
ManufacturerUpdateItem item = new ManufacturerUpdateItem();
|
|
ManufacturerUpdateItem item = new ManufacturerUpdateItem();
|
|
- item.VenderId = showItem.VenderId;
|
|
|
|
- item.VenderName = showItem.Name;
|
|
|
|
- item.BrandId = showItem.BrandId;
|
|
|
|
- item.BrandName = showItem.Brand;
|
|
|
|
- item.ProductTypeId = showItem.ProductTypeId;
|
|
|
|
- item.ProductTypeName = showItem.ModeNumber;
|
|
|
|
|
|
+ if (showItem != null)
|
|
|
|
+ {
|
|
|
|
+ item.VenderId = showItem.VenderId;
|
|
|
|
+ item.VenderName = showItem.Name;
|
|
|
|
+ item.BrandId = showItem.BrandId;
|
|
|
|
+ item.BrandName = showItem.Brand;
|
|
|
|
+ item.ProductTypeId = showItem.ProductTypeId;
|
|
|
|
+ item.ProductTypeName = showItem.ModeNumber;
|
|
|
|
+ }
|
|
|
|
+
|
|
return item;
|
|
return item;
|
|
}
|
|
}
|
|
- private static ManufacturerUpdateItem InitUpdateItem(JObject infos)
|
|
|
|
|
|
+ private static ManufacturerUpdateItem InitUpdateItem(JObject infos, string code)
|
|
{
|
|
{
|
|
ManufacturerUpdateItem item = new ManufacturerUpdateItem();
|
|
ManufacturerUpdateItem item = new ManufacturerUpdateItem();
|
|
try
|
|
try
|
|
@@ -215,6 +219,13 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
return item;
|
|
return item;
|
|
|
|
|
|
item.PraseJsonObject(infos);
|
|
item.PraseJsonObject(infos);
|
|
|
|
+ if (!string.IsNullOrEmpty(item.VenderId))
|
|
|
|
+ {
|
|
|
|
+ //mxg 20190926 处理解决从岗位上找不到生产厂家,品牌和型号 问题
|
|
|
|
+ var items = DalManufacturerLibrary.GetMManufacturers(code);
|
|
|
|
+ item = InitUpdateItem(items.FirstOrDefault(t => t.VenderId == item.VenderId && t.ProductTypeId == item.ProductTypeId));
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
{
|
|
{
|
|
@@ -231,10 +242,10 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
#region 其他信息点处理
|
|
#region 其他信息点处理
|
|
if (CurrentVender != null)
|
|
if (CurrentVender != null)
|
|
{
|
|
{
|
|
- var pointInfo= ManufacturerUpdateItem.CreateParameterInfos(CurrentVender.Parameters, m_MEquipment.Family.Code);
|
|
|
|
|
|
+ var pointInfo = ManufacturerUpdateItem.CreateParameterInfos(CurrentVender.Parameters, m_MEquipment.Family.Code);
|
|
updateObject = JObjectExt.Merge(updateObject, pointInfo);
|
|
updateObject = JObjectExt.Merge(updateObject, pointInfo);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
#endregion
|
|
#endregion
|
|
//加上更正时间信息点
|
|
//加上更正时间信息点
|
|
|
|
|
|
@@ -270,14 +281,14 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
List<string> displays = new List<string>() { updateItem.BrandName, updateItem.ProductTypeName, updateItem.VenderName };
|
|
List<string> displays = new List<string>() { updateItem.BrandName, updateItem.ProductTypeName, updateItem.VenderName };
|
|
displays = displays.Where(s => !string.IsNullOrWhiteSpace(s)).ToList();
|
|
displays = displays.Where(s => !string.IsNullOrWhiteSpace(s)).ToList();
|
|
return string.Join("+", displays);
|
|
return string.Join("+", displays);
|
|
- // return $"{updateItem.BrandName}+{updateItem.ProductTypeName}+{updateItem.VenderName}";
|
|
|
|
|
|
+ // return $"{updateItem.BrandName}+{updateItem.ProductTypeName}+{updateItem.VenderName}";
|
|
}
|
|
}
|
|
public static string GetValueDisplay(MRevitEquipBase equipment)
|
|
public static string GetValueDisplay(MRevitEquipBase equipment)
|
|
{
|
|
{
|
|
string result = NullDisplay;
|
|
string result = NullDisplay;
|
|
if (equipment == null)
|
|
if (equipment == null)
|
|
return result;
|
|
return result;
|
|
- var updateItem = InitUpdateItem(equipment.CloundJObject);
|
|
|
|
|
|
+ var updateItem = InitUpdateItem(equipment.CloundJObject, equipment.Family.Code);
|
|
if (updateItem == null || string.IsNullOrEmpty(updateItem.ProductTypeId))
|
|
if (updateItem == null || string.IsNullOrEmpty(updateItem.ProductTypeId))
|
|
return result;
|
|
return result;
|
|
return GetValueDisplay(updateItem);
|
|
return GetValueDisplay(updateItem);
|