|
@@ -18,6 +18,7 @@ using SAGA.MBI.Model;
|
|
|
using SAGA.MBI.RequestData;
|
|
|
using SAGA.RevitUtils;
|
|
|
using WPG.Data;
|
|
|
+using TryCatchWrapper = SAGA.MBI.Common.TryCatchWrapper;
|
|
|
|
|
|
namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
|
{
|
|
@@ -41,8 +42,11 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
|
|
|
|
private void WinManufacturer_Loaded(object sender, RoutedEventArgs e)
|
|
|
{
|
|
|
- InitData();
|
|
|
- this.DataContext = this;
|
|
|
+ TryCatchWrapper.HandleUI(() =>
|
|
|
+ {
|
|
|
+ InitData();
|
|
|
+ this.DataContext = this;
|
|
|
+ });
|
|
|
}
|
|
|
public void InitData()
|
|
|
{
|
|
@@ -85,22 +89,25 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
|
/// <param name="e"></param>
|
|
|
private void Add_Mode(object sender, RoutedEventArgs e)
|
|
|
{
|
|
|
- //MessageBox.Show("添加型号");
|
|
|
- Window main = null;
|
|
|
- if (CurrentVender != null)
|
|
|
+ TryCatchWrapper.HandleUI(() =>
|
|
|
{
|
|
|
- var dic = new Dictionary<string, object>();
|
|
|
- dic.Add("ManufactureId", CurrentVender.VenderId);
|
|
|
- main = FirmLibPost.StartWindow(@"WinManufactureBaseInfo\WinManufactureInfo", dic);
|
|
|
- }
|
|
|
+ Window main = null;
|
|
|
+ if (CurrentVender != null)
|
|
|
+ {
|
|
|
+ var dic = new Dictionary<string, object>();
|
|
|
+ dic.Add("ManufactureId", CurrentVender.VenderId);
|
|
|
+ main = FirmLibPost.StartWindow(@"WinManufactureBaseInfo\WinManufactureInfo", dic);
|
|
|
+ }
|
|
|
|
|
|
- else
|
|
|
- {
|
|
|
- main = new WinFirmMain(new WinManufactureBaseInfo());
|
|
|
- }
|
|
|
- main.Title += "--生产商管理";
|
|
|
- main.ShowDialog();
|
|
|
- InitData();
|
|
|
+ else
|
|
|
+ {
|
|
|
+ main = new WinFirmMain(new WinManufactureBaseInfo());
|
|
|
+ }
|
|
|
+ main.Title += "--生产商管理";
|
|
|
+ main.ShowDialog();
|
|
|
+ InitData();
|
|
|
+ });
|
|
|
+
|
|
|
}
|
|
|
/// <summary>
|
|
|
/// 修改型号
|
|
@@ -109,43 +116,52 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
|
/// <param name="e"></param>
|
|
|
private void Update_Type(object sender, RoutedEventArgs e)
|
|
|
{
|
|
|
- Window main = null;
|
|
|
- if (CurrentVender != null)
|
|
|
- {
|
|
|
- var dic = new Dictionary<string, object>();
|
|
|
- dic.Add("ManufactureId", CurrentVender.VenderId);
|
|
|
- dic.Add("BrandId", CurrentVender.BrandId);
|
|
|
- dic.Add("ProductId", CurrentVender.ProductId);
|
|
|
- main = FirmLibPost.StartWindow(@"WinManufactureBaseInfo\WinManufactureInfo\WinProductType", dic);
|
|
|
- }
|
|
|
|
|
|
- else
|
|
|
+ TryCatchWrapper.HandleUI(() =>
|
|
|
{
|
|
|
+ Window main = null;
|
|
|
+ if (CurrentVender != null)
|
|
|
+ {
|
|
|
+ var dic = new Dictionary<string, object>();
|
|
|
+ dic.Add("ManufactureId", CurrentVender.VenderId);
|
|
|
+ dic.Add("BrandId", CurrentVender.BrandId);
|
|
|
+ dic.Add("ProductId", CurrentVender.ProductId);
|
|
|
+ main = FirmLibPost.StartWindow(@"WinManufactureBaseInfo\WinManufactureInfo\WinProductType", dic);
|
|
|
+ }
|
|
|
|
|
|
- main = new WinFirmMain(new WinManufactureBaseInfo());
|
|
|
- }
|
|
|
- main.Title += "--生产商管理";
|
|
|
- main.ShowDialog();
|
|
|
- InitData();
|
|
|
+ else
|
|
|
+ {
|
|
|
+
|
|
|
+ main = new WinFirmMain(new WinManufactureBaseInfo());
|
|
|
+ }
|
|
|
+ main.Title += "--生产商管理";
|
|
|
+ main.ShowDialog();
|
|
|
+ InitData();
|
|
|
+ });
|
|
|
+
|
|
|
}
|
|
|
private void SearchInputEditor_Click(object sender, RoutedEventArgs e)
|
|
|
{
|
|
|
- SearchInputEditor editor = sender as SearchInputEditor;
|
|
|
- if (editor == null) return;
|
|
|
- var inputText = editor.Text;
|
|
|
- List<MManufacturer> newList = null;
|
|
|
- if (string.IsNullOrEmpty(inputText))
|
|
|
+ TryCatchWrapper.HandleUI(() =>
|
|
|
{
|
|
|
- newList = new List<MManufacturer>(BaseVenders);
|
|
|
+ SearchInputEditor editor = sender as SearchInputEditor;
|
|
|
+ if (editor == null) return;
|
|
|
+ var inputText = editor.Text;
|
|
|
+ List<MManufacturer> newList = null;
|
|
|
+ if (string.IsNullOrEmpty(inputText))
|
|
|
+ {
|
|
|
+ newList = new List<MManufacturer>(BaseVenders);
|
|
|
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- var newInput = inputText;//.ToUpper();
|
|
|
- newList = BaseVenders.Where(c => c.Name.Contains(newInput)||c.Brand.Contains(newInput) || c.ModeNumber.Contains(newInput)).ToList();
|
|
|
- }
|
|
|
- Venders = new ObservableCollection<MManufacturer>(newList);
|
|
|
- //CurrentVender = Venders.FirstOrDefault();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ var newInput = inputText;//.ToUpper();
|
|
|
+ newList = BaseVenders.Where(c => c.Name.Contains(newInput) || c.Brand.Contains(newInput) || c.ModeNumber.Contains(newInput)).ToList();
|
|
|
+ }
|
|
|
+ Venders = new ObservableCollection<MManufacturer>(newList);
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
}
|
|
|
private void BtnSaveChange_OnClick(object sender, RoutedEventArgs e)
|
|
|
{
|
|
@@ -251,7 +267,10 @@ namespace SAGA.MBI.WinView.ModeInfoMaintenance
|
|
|
}
|
|
|
public static string GetValueDisplay(ManufacturerUpdateItem updateItem)
|
|
|
{
|
|
|
- return $"{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();
|
|
|
+ return string.Join("+", displays);
|
|
|
+ // return $"{updateItem.BrandName}+{updateItem.ProductTypeName}+{updateItem.VenderName}";
|
|
|
}
|
|
|
public static string GetValueDisplay(MRevitEquipBase equipment)
|
|
|
{
|