HStation/XHS.V1.0.git

			@@ -52,7 +52,7 @@
			_allBindingList.Add(new PackageViewModel(item, manufacturer.Name));
			}
			}
			_manufacturerName=manufacturer.Name;
			_manufacturerName = manufacturer.Name;
			this.kitViewModelBindingSource.ResetBindings(false);
			}

			@@ -69,20 +69,18 @@
			dlg.SetBindingData(series.ID);
			dlg.ReloadDataEvent += async (rhs, allMappingList) =>
			{
			rhs.PumpTotal = allMappingList.Count;
			var id = await _bll.Insert(rhs);
			if (id > 0)
			{
			rhs.ID = id;
			_allBindingList.Add(new PackageViewModel(await _bll.GetByID(id), _manufacturerName));
			_allBindingList.Add(new PackageViewModel(await _bll.GetByID(id), _manufacturerName));
			foreach (var item in allMappingList)
			{
			var model = new Vmo.AssetsPackagePumpMappingVmo();
			model.PumpMainID = item.PumpID;
			model.EquipmentMainID = id;
			for (int i = 0; i < item.UserCount; i++)
			{
			await _mappingBll.Insert(model);
			}
			await _mappingBll.Insert(model);
			}
			for (int i = 0; i < _allBindingList.Count; i++)
			{
			@@ -116,6 +114,7 @@
			dlg.SetBindingData(Equipment);
			dlg.ReloadDataEvent += async (rhs, allMappingList) =>
			{
			rhs.PumpTotal = allMappingList.Count;
			if (await _bll.Update(rhs))
			{
			vm.Reset(rhs);
			@@ -126,11 +125,9 @@
			var model = new Vmo.AssetsPackagePumpMappingVmo();
			model.PumpMainID = item.PumpID;
			model.EquipmentMainID = vm.ID;
			for (int i = 0; i < item.UserCount; i++)
			{
			await _mappingBll.Insert(model);
			}
			await _mappingBll.Insert(model);
			}
			GridView1_FocusedRowChanged(null, null);

			return true;
			}
			@@ -167,8 +164,31 @@
			}

			//编辑属性
			private void BarBtnEidtProp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			private async void BarBtnEidtProp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
			{
			var currentVm = this.gridView1.GetCurrentViewModel(_allBindingList);
			if (currentVm == null)
			{
			MessageBoxHelper.ShowWarning("请选择数据行！");
			return;
			}
			var dlg = new EditPackagePartPropDlg();
			var model = await _bll.GetByID(currentVm.ID);
			if (model == null)
			return;
			dlg.SetBindingData(model);
			dlg.ReloadEvent += async (part, content, map) =>
			{
			var bll = new BLL.AssetsPackagePartMain();
			var id = await bll.InsertEx(part, content, map);
			if (id > 0)
			{
			return true;
			}
			return false;
			};

			dlg.ShowDialog();
			}

			//成套设备选择变换事件
			@@ -178,7 +198,7 @@
			var currentVm = this.gridView1.GetCurrentViewModel(_allBindingList);
			if (currentVm != null)
			{
			var allList = await new BLL.AssetsPackagePumpMapping().GetByKitID(currentVm.ID);
			var allList = await new BLL.AssetsPackagePumpMapping().GetByKitID(currentVm.ID);
			if (allList != null)
			{
			foreach (var item in allList)