From ca5f300a7cef85d22b5e0f9d59d117c49f9909b3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 19 十一月 2024 09:42:16 +0800
Subject: [PATCH] 完善资产界面
---
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroup.cs | 0
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Cache/ManufacturerCacheHelper.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs | 26
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.resx | 0
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPartMain.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/PropGroupChoiceViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/01-series/AddAssetsExchangerSeriesDlg.cs | 7
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs | 6
BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain_Instance.cs | 0
Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerMapping.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 22
BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries_Instance.cs | 85 ++
Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturerSeries.cs | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PumpAccountViewModel.cs | 0
BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/ManufacturerSeries.cs | 267 ++++++++
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.cs | 12
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AddAssetsFourlinkSeriesDlg.cs | 7
BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/Manufacturer.cs | 17
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/ManufacturerMappingDto.cs | 0
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.resx | 0
BLL/HStation.BLL.Assets.Core/03-localclient/13-Package/AssetsPackagePumpMapping.cs | 8
Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageSeries.cs | 0
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/UpdateManufacturerMappingInput.cs | 0
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer.cs | 16
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AssetsPackageSeriesViewModel.cs | 6
Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackagePumpMapping.cs | 2
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/AddManufacturerInput.cs | 7
Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs | 25
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/UpdateManufacturerInput.cs | 5
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries_Instance.cs | 2
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/Cache/ManufacturerSeriesCacheHelper.cs | 71 ++
BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries.cs | 0
BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries_Instance.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.cs | 22
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/AddPipeLineSeriesDlg.cs | 7
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.cs | 4
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/ManufacturerDto.cs | 7
BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturerSeries.cs | 11
Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageMain.cs | 11
Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IAssetsValveSeries.cs | 11
Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturer.cs | 2
Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageSeriesVmo.cs | 0
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpType.cs | 0
Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/AddManufacturerMappingInput.cs | 0
Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturerSeries.cs | 2
Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackagePumpMapping.cs | 11
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping_Instance.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.resx | 32
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.Designer.cs | 12
Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/UpdateAssetsManufacturerSeriesInput.cs | 39
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.cs | 12
WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs | 17
Vmo/HStation.Vmo.Assets.Core/10-Manufacturer/ManufacturerSeriesVmo.cs | 50 +
Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs | 29
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroupAndMainMapping.cs | 0
Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackageMain.cs | 2
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain_Instance.cs | 2
Service/HStation.Service.Assets.Core/02-model/08-Valve/AssetsValveCoefficient.cs | 4
BLL/HStation.BLL.Assets.Core/01-interface/13-IPackage/IAssetsPackagePumpMapping.cs | 8
BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries.cs | 27
Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturer.cs | 2
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs | 0
Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerMapping.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.resx | 0
BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer_Instance.cs | 0
Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj | 1
BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer.cs | 9
Service/HStation.Service.Assets.Core/05-service/13-Package/01-PackageMain/AssetsPackageMain.cs | 16
Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackageMain.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/01-series/AddAssetsElbowSeriesDlg.cs | 7
Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeriesDto.cs | 70 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.Designer.cs | 2
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer_Instance.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.resx | 0
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.resx | 0
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.resx | 0
BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturer.cs | 5
Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerSeries.cs | 87 ++
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeries.cs | 0
Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageMainVmo.cs | 0
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries_Instance.cs | 63 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.cs | 0
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesManufacturerMapping.cs | 0
Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IManufacturer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.Designer.cs | 0
Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackagePumpMappingVmo.cs | 0
Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackagePumpMapping.cs | 2
Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.Designer.cs | 2
BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain.cs | 2
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesTypeMapping.cs | 0
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMainAndPartMapping.cs | 0
Service/HStation.Service.Assets.Core/05-service/13-Package/03-PackageMapping/AssetsPackagePumpMapping.cs | 26
Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AddAssetsManufacturerSeriesInput.cs | 48 +
Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj | 10
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.cs | 26
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/AddAssetsThreelinkSeriesDlg.cs | 7
/dev/null | 123 ---
Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerSeries.cs | 99 +++
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMain.cs | 0
Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries.cs | 363 +++++++++++
BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain.cs | 0
Dto/HStation.Dto.Assets.Core/HStation.Dto.Assets.Core.csproj | 3
BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.resx | 0
113 files changed, 1,482 insertions(+), 458 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturer.cs b/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturer.cs
index a4d3add..704754c 100644
--- a/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturer.cs
+++ b/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturer.cs
@@ -7,10 +7,5 @@
/// </summary>
public interface IAssetsManufacturer : IBaseCAL<AddAssetsManufacturerInput, UpdateAssetsManufacturerInput, AssetsManufacturerDto>
{
- /// <summary>
- /// 鏇存柊鐘舵��
- /// </summary>
- /// <returns></returns>
- public Task<bool> UpdateUseStatus(long ID, int status);
}
}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturerSeries.cs b/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturerSeries.cs
new file mode 100644
index 0000000..a8d44cf
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/01-interface/10-IManufacturer/IManufacturerSeries.cs
@@ -0,0 +1,11 @@
+锘縰sing Yw.CAL;
+
+namespace HStation.CAL
+{
+ /// <summary>
+ /// 鎶ヨ绛夌骇
+ /// </summary>
+ public interface IAssetsManufacturerSeries : IBaseCAL<AddAssetsManufacturerSeriesInput, UpdateAssetsManufacturerSeriesInput, AssetsManufacturerSeriesDto>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+ {
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/01-interface/13-IPackage/IAssetsPackagePumpMapping.cs b/BLL/HStation.BLL.Assets.Core/01-interface/13-IPackage/IAssetsPackagePumpMapping.cs
index 7cc5ca4..ff148a5 100644
--- a/BLL/HStation.BLL.Assets.Core/01-interface/13-IPackage/IAssetsPackagePumpMapping.cs
+++ b/BLL/HStation.BLL.Assets.Core/01-interface/13-IPackage/IAssetsPackagePumpMapping.cs
@@ -3,18 +3,18 @@
namespace HStation.CAL
{
/// <summary>
- /// 鎶ヨ绛夌骇
+ ///
/// </summary>
public interface IAssetsPackagePumpMapping : IBaseCAL<AddAssetsPackagePumpMappingInput, UpdateAssetsPackagePumpMappingInput, AssetsPackagePumpMappingDto>
{
/// <summary>
- /// 閫氳繃Kit ID 鑾峰彇
+ /// 閫氳繃鎴愬璁惧ID 鑾峰彇
/// </summary>
- public Task<List<AssetsPackagePumpMappingDto>> GetByKitID(long ID);
+ public Task<List<AssetsPackagePumpMappingDto>> GetByPackageID(long ID);
/// <summary>
/// 閫氳繃 鎴愬璁惧ID 鍒犻櫎
/// </summary>
- public Task<bool> DeleteByKitID(long ID);
+ public Task<bool> DeleteByPackageID(long ID);
}
}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/Manufacturer.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/Manufacturer.cs
index 84498f2..ac73ce8 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/Manufacturer.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/Manufacturer.cs
@@ -138,23 +138,6 @@
}
/// <summary>
- /// 鏇存柊浣跨敤鐘舵��
- /// </summary>
- public async Task<bool> UpdateUseStatus(long ID, int status)
- {
- return await Task.Factory.StartNew(() =>
- {
- var model = _service.GetByID(ID);
- if (model == null)
- {
- throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{ID} 鏁版嵁涓嶅瓨鍦�");
- }
- var bol = _service.UpdateUseStatus(ID, status);
- return bol;
- });
- }
-
- /// <summary>
/// 澶ф壒閲忔洿鏂�
/// </summary>
public async Task<bool> BulkUpdates(List<UpdateAssetsManufacturerInput> list)
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/ManufacturerSeries.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/ManufacturerSeries.cs
new file mode 100644
index 0000000..9dc906f
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/10-Manufacturer/ManufacturerSeries.cs
@@ -0,0 +1,267 @@
+锘縰sing Yw.Dto;
+
+namespace HStation.CAL.LocalClient
+{
+ /// <summary>
+ /// 鎶ヨ绛夌骇
+ /// </summary>
+ public class AssetsManufacturerSeries : IAssetsManufacturerSeries
+ {
+ private readonly HStation.Service.AssetsManufacturerSeries _service = new();
+
+ #region Query
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ public async Task<List<AssetsManufacturerSeriesDto>> GetAll()
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = _service.GetAll();
+ var vm_list = list?.Select(x => new AssetsManufacturerSeriesDto(x)).ToList();
+ return vm_list;
+ });
+ }
+
+ /// <summary>
+ /// 閫氳繃 ID 鑾峰彇
+ /// </summary>
+ public async Task<AssetsManufacturerSeriesDto> GetByID(long ID)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var model = _service.GetByID(ID);
+ return model == null ? null : new AssetsManufacturerSeriesDto(model);
+ });
+ }
+
+ /// <summary>
+ /// 閫氳繃 Ids 鑾峰彇
+ /// </summary>
+ public async Task<List<AssetsManufacturerSeriesDto>> GetByIds(List<long> Ids)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = _service.GetByIds(Ids);
+ var vm_list = list?.Select(x => new AssetsManufacturerSeriesDto(x)).ToList();
+ return vm_list;
+ });
+ }
+
+ #endregion Query
+
+ #region Insert
+
+ /// <summary>
+ /// 鎻掑叆涓�鏉�
+ /// </summary>
+ public async Task<long> Insert(AddAssetsManufacturerSeriesInput input)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var model = input.Adapt<AddAssetsManufacturerSeriesInput, Model.AssetsManufacturerSeries>();
+ model.SortCode = _service.GetMaxSortCode() + 1;
+ var id = _service.Insert(model);
+ return id;
+ });
+ }
+
+ /// <summary>
+ /// 鎵归噺鎻掑叆
+ /// </summary>
+ public async Task<bool> Inserts(List<AddAssetsManufacturerSeriesInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = inputList.Select(x => x.Adapt<AddAssetsManufacturerSeriesInput, Model.AssetsManufacturerSeries>()).ToList();
+ list.ForEach(x =>
+ {
+ x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
+ });
+ var bol = _service.Inserts(list);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 澶ф壒閲忔彃鍏�
+ /// </summary>
+ public async Task<bool> BulkInserts(List<AddAssetsManufacturerSeriesInput> list)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ return false;
+ });
+ }
+
+ #endregion Insert
+
+ #region Update
+
+ /// <summary>
+ /// 鏇存柊涓�鏉�
+ /// </summary>
+ public async Task<bool> Update(UpdateAssetsManufacturerSeriesInput input)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var model = _service.GetByID(input.ID);
+ if (model == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
+ }
+
+ var rhs = new Model.AssetsManufacturerSeries(model);
+ input.Adapt(rhs);
+ var bol = _service.Update(rhs);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 鎵归噺鏇存柊
+ /// </summary>
+ public async Task<bool> Updates(List<UpdateAssetsManufacturerSeriesInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ if (inputList == null || inputList.Count < 1)
+ {
+ return false;
+ }
+ var list = inputList.Select(x => x.Adapt<UpdateAssetsManufacturerSeriesInput, Model.AssetsManufacturerSeries>()).ToList();
+ var bol = _service.Updates(list);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 澶ф壒閲忔洿鏂�
+ /// </summary>
+ public async Task<bool> BulkUpdates(List<UpdateAssetsManufacturerSeriesInput> list)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ return false;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊缂栫爜
+ /// </summary>
+ public async Task<bool> UpdateCode(long ID, string Code)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ return false;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊鎺掑簭鐮�
+ /// </summary>
+ public async Task<bool> UpdateSortCode(long ID, int SortCode)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.UpdateSortCode(ID, SortCode);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊鎺掑簭
+ /// </summary>
+ public async Task<bool> UpdateSorter(List<UpdateSortCodeInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = inputList.Select(x => x.Adapt<Yw.Model.Sorter>()).ToList();
+ var bol = _service.UpdateSorter(list);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊 Paras
+ /// </summary>
+ public async Task<bool> UpdateParas(long ID, Dictionary<string, string> Paras)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.UpdateParas(ID, Paras);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊 Flags
+ /// </summary>
+ public async Task<bool> UpdateFlags(long ID, List<string> Flags)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.UpdateFlags(ID, Flags);
+ return bol;
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊 TagName
+ /// </summary>
+ public async Task<bool> UpdateTagName(long ID, string TagName)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.UpdateTagName(ID, TagName);
+ return bol;
+ });
+ }
+
+ #endregion Update
+
+ #region Delete
+
+ /// <summary>
+ /// 閫氳繃 ID 鍒犻櫎
+ /// </summary>
+ public async Task<bool> DeleteByID(long ID)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.DeleteByID(ID, out string msg);
+ if (!bol)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
+ }
+ return true;
+ });
+ }
+
+ /// <summary>
+ /// 閫氳繃 Ids 鍒犻櫎
+ /// </summary>
+ public async Task<bool> DeleteByIds(List<long> Ids)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ return false;
+ });
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍏ㄩ儴
+ /// </summary>
+ /// <returns></returns>
+ public async Task<bool> DeleteAll()
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ return false;
+ });
+ }
+
+ #endregion Delete
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/13-Package/AssetsPackagePumpMapping.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/13-Package/AssetsPackagePumpMapping.cs
index baaa6c5..1232241 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/13-Package/AssetsPackagePumpMapping.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/13-Package/AssetsPackagePumpMapping.cs
@@ -37,11 +37,11 @@
});
}
- public async Task<List<AssetsPackagePumpMappingDto>> GetByKitID(long ID)
+ public async Task<List<AssetsPackagePumpMappingDto>> GetByPackageID(long ID)
{
return await Task.Factory.StartNew(() =>
{
- var list = _service.GetByKitID(ID);
+ var list = _service.GetByPackageID(ID);
var vm_list = list?.Select(x => new AssetsPackagePumpMappingDto(x)).ToList();
return vm_list;
});
@@ -187,11 +187,11 @@
/// <summary>
/// 閫氳繃 鎴愬璁惧ID 鍒犻櫎
/// </summary>
- public async Task<bool> DeleteByKitID(long ID)
+ public async Task<bool> DeleteByPackageID(long ID)
{
return await Task.Factory.StartNew(() =>
{
- var bol = _service.DeleteByKItID(ID, out string msg);
+ var bol = _service.DeleteByPackageID(ID, out string msg);
if (!bol)
{
throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/ThreeLinkSeries.cs b/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/ThreeLinkSeries.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries.cs
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/ThreeLinkSeries_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries_Instance.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/ThreeLinkSeries_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/01-ThreeSeries/AssetsThreelinkSeries_Instance.cs
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/ThreeLinkMain.cs b/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/ThreeLinkMain.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain.cs
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/ThreeLinkMain_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain_Instance.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/ThreeLinkMain_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/07-Threelink/02-ThreeMain/AssetsThreelinkMain_Instance.cs
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries.cs
similarity index 78%
copy from BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs
copy to BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries.cs
index fd32353..44d15bf 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries.cs
@@ -6,16 +6,16 @@
/// <summary>
///
/// </summary>
- public partial class AssetsManufacturer
+ public partial class AssetsManufacturerSeries
{
- private readonly HStation.CAL.IAssetsManufacturer _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsManufacturer>();
+ private readonly HStation.CAL.IAssetsManufacturerSeries _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsManufacturerSeries>();
#region Query
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
- public virtual async Task<List<AssetsManufacturerVmo>> GetAll()
+ public virtual async Task<List<AssetsManufacturerSeriesVmo>> GetAll()
{
var dtoList = await _cal.GetAll();
return Dto2Vmos(dtoList);
@@ -24,7 +24,7 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public virtual async Task<AssetsManufacturerVmo> GetByID(long ID)
+ public virtual async Task<AssetsManufacturerSeriesVmo> GetByID(long ID)
{
var dto = await _cal.GetByID(ID);
return Dto2Vmo(dto);
@@ -33,7 +33,7 @@
/// <summary>
/// 閫氳繃 Ids 鑾峰彇
/// </summary>
- public virtual async Task<List<AssetsManufacturerVmo>> GetByIds(List<long> Ids)
+ public virtual async Task<List<AssetsManufacturerSeriesVmo>> GetByIds(List<long> Ids)
{
var dtoList = await _cal.GetByIds(Ids);
return Dto2Vmos(dtoList);
@@ -46,7 +46,7 @@
/// <summary>
/// 鎻掑叆涓�鏉�
/// </summary>
- public virtual async Task<long> Insert(AssetsManufacturerVmo vmo)
+ public virtual async Task<long> Insert(AssetsManufacturerSeriesVmo vmo)
{
var dto = Vmo2AddDto(vmo);
var id = await _cal.Insert(dto);
@@ -56,7 +56,7 @@
/// <summary>
/// 鎻掑叆澶氭潯
/// </summary>
- public virtual async Task<bool> Inserts(List<AssetsManufacturerVmo> vmoList)
+ public virtual async Task<bool> Inserts(List<AssetsManufacturerSeriesVmo> vmoList)
{
var dtoList = Vmo2AddDtos(vmoList);
var bol = await _cal.Inserts(dtoList);
@@ -70,7 +70,7 @@
/// <summary>
/// 鏇存柊
/// </summary>
- public virtual async Task<bool> Update(AssetsManufacturerVmo vmo)
+ public virtual async Task<bool> Update(AssetsManufacturerSeriesVmo vmo)
{
var dto = Vmo2UpdateDto(vmo);
var bol = await _cal.Update(dto);
@@ -78,18 +78,9 @@
}
/// <summary>
- /// 鏇存柊
- /// </summary>
- public virtual async Task<bool> UpdateUseStatus(long ID, int status)
- {
- var bol = await _cal.UpdateUseStatus(ID, status);
- return bol;
- }
-
- /// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public virtual async Task<bool> Updates(List<AssetsManufacturerVmo> vmoList)
+ public virtual async Task<bool> Updates(List<AssetsManufacturerSeriesVmo> vmoList)
{
var dtoList = Vmo2UpdateDtos(vmoList);
var bol = await _cal.Updates(dtoList);
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries_Instance.cs
new file mode 100644
index 0000000..d28e8fe
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Series/AssetsManufacturerSeries_Instance.cs
@@ -0,0 +1,85 @@
+锘縰sing AutoMapper;
+
+namespace HStation.BLL
+{
+ public partial class AssetsManufacturerSeries
+ {
+ //dto to vmo
+ internal static HStation.Vmo.AssetsManufacturerSeriesVmo Dto2Vmo(AssetsManufacturerSeriesDto dto)
+ {
+ if (dto == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Dto.Assets.AssetsManufacturerSeriesDto, HStation.Vmo.AssetsManufacturerSeriesVmo>()
+ ).CreateMapper();
+ var vmo = mapper.Map<AssetsManufacturerSeriesDto, HStation.Vmo.AssetsManufacturerSeriesVmo>(dto);
+ return vmo;
+ }
+
+ //dto to vmos
+ internal static List<HStation.Vmo.AssetsManufacturerSeriesVmo> Dto2Vmos(List<AssetsManufacturerSeriesDto> dtos)
+ {
+ if (dtos == null || dtos.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<AssetsManufacturerSeriesDto, HStation.Vmo.AssetsManufacturerSeriesVmo>()
+ ).CreateMapper();
+ var vmos = mapper.Map<List<AssetsManufacturerSeriesDto>, List<HStation.Vmo.AssetsManufacturerSeriesVmo>>(dtos);
+ return vmos;
+ }
+
+ //vmo to add dto
+ internal static HStation.Dto.Assets.AddAssetsManufacturerSeriesInput Vmo2AddDto(HStation.Vmo.AssetsManufacturerSeriesVmo vmo)
+ {
+ if (vmo == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.AddAssetsManufacturerSeriesInput>()
+ ).CreateMapper();
+ var dto = mapper.Map<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.AddAssetsManufacturerSeriesInput>(vmo);
+ return dto;
+ }
+
+ //vmo to add dtos
+ internal static List<HStation.Dto.Assets.AddAssetsManufacturerSeriesInput> Vmo2AddDtos(List<HStation.Vmo.AssetsManufacturerSeriesVmo> vmoList)
+ {
+ if (vmoList == null || vmoList.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.AddAssetsManufacturerSeriesInput>()
+ ).CreateMapper();
+ var dtoList = mapper.Map<List<HStation.Vmo.AssetsManufacturerSeriesVmo>, List<HStation.Dto.Assets.AddAssetsManufacturerSeriesInput>>(vmoList);
+ return dtoList;
+ }
+
+ //vmo to update dto
+ internal static HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput Vmo2UpdateDto(HStation.Vmo.AssetsManufacturerSeriesVmo vmo)
+ {
+ if (vmo == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput>()
+ ).CreateMapper();
+ var dto = mapper.Map<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput>(vmo);
+ return dto;
+ }
+
+ //vmo to update dtos
+ internal static List<HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput> Vmo2UpdateDtos(List<HStation.Vmo.AssetsManufacturerSeriesVmo> vmoList)
+ {
+ if (vmoList == null || vmoList.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsManufacturerSeriesVmo, HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput>()
+ ).CreateMapper();
+ var dtoList = mapper.Map<List<HStation.Vmo.AssetsManufacturerSeriesVmo>, List<HStation.Dto.Assets.UpdateAssetsManufacturerSeriesInput>>(vmoList);
+ return dtoList;
+ }
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer.cs
similarity index 92%
rename from BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer.cs
index fd32353..905fefb 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer.cs
@@ -78,15 +78,6 @@
}
/// <summary>
- /// 鏇存柊
- /// </summary>
- public virtual async Task<bool> UpdateUseStatus(long ID, int status)
- {
- var bol = await _cal.UpdateUseStatus(ID, status);
- return bol;
- }
-
- /// <summary>
/// 鎵归噺鏇存柊
/// </summary>
public virtual async Task<bool> Updates(List<AssetsManufacturerVmo> vmoList)
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer_Instance.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/01-Main/Manufacturer_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/10-Manufacturer/02-Main/Manufacturer_Instance.cs
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain.cs
similarity index 98%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain.cs
index 50aaded..1de5a04 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain.cs
@@ -6,7 +6,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsKitMain
+ public partial class AssetsPackageMain
{
private readonly HStation.CAL.IAssetsPackageMain _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsPackageMain>();
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain_Instance.cs
similarity index 98%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain_Instance.cs
index 43a96a1..b21df0c 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/01-KitMain/AssetsKitMain_Instance.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/01-PackageMain/AssetsPackageMain_Instance.cs
@@ -2,7 +2,7 @@
namespace HStation.BLL
{
- public partial class AssetsKitMain
+ public partial class AssetsPackageMain
{
//dto to vmo
internal static HStation.Vmo.AssetsPackageMainVmo Dto2Vmo(AssetsPackageMainDto dto)
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries.cs
similarity index 97%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries.cs
index ae69de2..b02bca3 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries.cs
@@ -6,7 +6,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsKitSeries
+ public partial class AssetsPackageSeries
{
private readonly HStation.CAL.IAssetsPackageSeries _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsPackageSeries>();
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries_Instance.cs
similarity index 98%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries_Instance.cs
index e1dbf1f..404e09d 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/02-kitSeries/AssetsKitSeries_Instance.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/02-PackageSeries/AssetsPackageSeries_Instance.cs
@@ -2,7 +2,7 @@
namespace HStation.BLL
{
- public partial class AssetsKitSeries
+ public partial class AssetsPackageSeries
{
//dto to vmo
internal static HStation.Vmo.AssetsPackageSeriesVmo Dto2Vmo(AssetsPackageSeriesDto dto)
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping.cs
similarity index 95%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping.cs
index 9e2fb48..ce08d84 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping.cs
@@ -8,7 +8,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsKitPumpMapping
+ public partial class AssetsPackagePumpMapping
{
private readonly HStation.CAL.IAssetsPackagePumpMapping _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsPackagePumpMapping>();
@@ -36,7 +36,7 @@
public async Task<List<Vmo.AssetsPackagePumpMappingVmo>> GetByKitID(long ID)
{
- var DtoList = await _cal.GetByKitID(ID);
+ var DtoList = await _cal.GetByPackageID(ID);
var VmoList = Dto2Vmos(DtoList);
return VmoList;
}
@@ -130,7 +130,7 @@
/// </summary>
public async Task<bool> DeleteByKitID(long ID)
{
- return await _cal.DeleteByKitID(ID);
+ return await _cal.DeleteByPackageID(ID);
}
/// <summary>
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping_Instance.cs
similarity index 98%
rename from BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping_Instance.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping_Instance.cs
index fa5ded4..d460b75 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/13-Kit/03-KitPumpMapping/AssetsKitPumpMapping_Instance.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/13-Package/03-PackagePumpMapping/AssetsPackagePumpMapping_Instance.cs
@@ -2,7 +2,7 @@
namespace HStation.BLL
{
- public partial class AssetsKitPumpMapping
+ public partial class AssetsPackagePumpMapping
{
//dto to vmo
internal static HStation.Vmo.AssetsPackagePumpMappingVmo Dto2Vmo(AssetsPackagePumpMappingDto dto)
diff --git a/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj b/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
index eafc15b..574564f 100644
--- a/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
+++ b/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
@@ -19,22 +19,27 @@
<Compile Remove="04-bll\02-Valve\02-PumpGroup\**" />
<Compile Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<Compile Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
+ <Compile Remove="04-bll\10-Manufacturer\02-Mapping\**" />
<EmbeddedResource Remove="04-bll\02-Valve\02-AssetsPumpGroup\**" />
<EmbeddedResource Remove="04-bll\02-Valve\02-PumpGroup\**" />
<EmbeddedResource Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<EmbeddedResource Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
+ <EmbeddedResource Remove="04-bll\10-Manufacturer\02-Mapping\**" />
<None Remove="04-bll\02-Valve\02-AssetsPumpGroup\**" />
<None Remove="04-bll\02-Valve\02-PumpGroup\**" />
<None Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<None Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
+ <None Remove="04-bll\10-Manufacturer\02-Mapping\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="01-interface\03-IValveManage\IAssetsPumpGroupAndMainMap.cs" />
<Compile Remove="01-interface\03-IValveManage\IPumpGroupAndMainMap.cs" />
<Compile Remove="01-interface\03-IValveManage\IValveGroup.cs" />
+ <Compile Remove="01-interface\10-IManufacturer\IManufacturerMapping.cs" />
<Compile Remove="03-localclient\03-Valve\ValveGroup.cs" />
<Compile Remove="03-localclient\03-Valve\ValveGroupAndMainMap.cs" />
+ <Compile Remove="03-localclient\10-Manufacturer\ManufacturerMapping.cs" />
<Compile Remove="04-bll\03-Adapting\AdaptingManage_Instance.cs" />
<Compile Remove="04-bll\05-Pipe\AdaptingManage_Instance.cs" />
</ItemGroup>
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index 9e3e03d..1d80da4 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -419,7 +419,7 @@
};
if(!IsExistPage(guid,true))
{
- var page=new KitManageMainPage();
+ var page=new PackageManageMainPage();
CreatePage(page,guid);
}
}
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AddAssetsManufacturerSeriesInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AddAssetsManufacturerSeriesInput.cs
new file mode 100644
index 0000000..87ef071
--- /dev/null
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AddAssetsManufacturerSeriesInput.cs
@@ -0,0 +1,48 @@
+锘縰sing HStation.Assets;
+using Yw.Model;
+
+namespace HStation.Dto.Assets
+{
+ public class AddAssetsManufacturerSeriesInput
+ {
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鐖剁骇ID
+ /// </summary>
+ public List<long> ParentIds { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeriesDto.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeriesDto.cs
new file mode 100644
index 0000000..59833d1
--- /dev/null
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeriesDto.cs
@@ -0,0 +1,70 @@
+锘縰sing HStation.Assets;
+using Yw.Model;
+
+namespace HStation.Dto.Assets
+{
+ public class AssetsManufacturerSeriesDto
+ {
+ public AssetsManufacturerSeriesDto()
+ {
+ }
+
+ public AssetsManufacturerSeriesDto(Model.AssetsManufacturerSeries rhs)
+ {
+ this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
+ this.CatalogID = rhs.CatalogID;
+ this.Name = rhs.Name;
+ this.Paras = rhs.Paras;
+ this.Flags = rhs.Flags;
+ this.TagName = rhs.TagName;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
+ }
+
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鐖剁骇ID
+ /// </summary>
+ public List<long> ParentIds { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/UpdateAssetsManufacturerSeriesInput.cs
similarity index 64%
copy from Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs
copy to Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/UpdateAssetsManufacturerSeriesInput.cs
index 1a16c5d..4270465 100644
--- a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/01-ManufacturerSeries/UpdateAssetsManufacturerSeriesInput.cs
@@ -1,8 +1,10 @@
-锘縰sing System.ComponentModel.DataAnnotations;
+锘縰sing HStation.Assets;
+using System.ComponentModel.DataAnnotations;
+using Yw.Model;
namespace HStation.Dto.Assets
{
- public class UpdateAssetsManufacturerInput
+ public class UpdateAssetsManufacturerSeriesInput
{
/// <summary>
/// id
@@ -11,39 +13,34 @@
public long ID { get; set; }
/// <summary>
+ /// 鐖剁骇ID
+ /// </summary>
+ public List<long> ParentIds { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
/// <summary>
- /// 鑱旂郴浜�
+ /// 鍙傛暟
/// </summary>
- public string Contacter { get; set; }
+ public Dictionary<string, string> Paras { get; set; }
/// <summary>
- /// 鑱旂郴鐢佃瘽
- /// </summary>
- public string Telephone { get; set; }
-
- /// <summary>
- /// 鍦板潃
- /// </summary>
- public string Address { get; set; }
-
- /// <summary>
- /// 鏍囩鍒楄〃
+ /// 鏍囩
/// </summary>
public List<string> Flags { get; set; }
/// <summary>
- /// 鏍囩鍚嶇О
+ /// 鏍囧織
/// </summary>
public string TagName { get; set; }
-
- /// <summary>
- /// 浣跨敤鐘舵��
- /// </summary>
- public Yw.Model.eUseStatus UseStatus { get; set; }
/// <summary>
/// 鎺掑簭鐮�
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/AddManufacturerInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/AddManufacturerInput.cs
similarity index 91%
rename from Dto/HStation.Dto.Assets.Core/09-Manufacturer/AddManufacturerInput.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/AddManufacturerInput.cs
index cd9802c..f80695c 100644
--- a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/AddManufacturerInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/AddManufacturerInput.cs
@@ -12,12 +12,12 @@
public AddAssetsManufacturerInput(Model.AssetsManufacturer rhs)
{
this.Name = rhs.Name;
+ this.SeriesID = rhs.SeriesID;
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -28,6 +28,11 @@
public string Name { get; set; }
/// <summary>
+ /// 绯诲垪ID
+ /// </summary>
+ public long SeriesID { get; set; }
+
+ /// <summary>
/// 鑱旂郴浜�
/// </summary>
public string Contacter { get; set; }
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/ManufacturerDto.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/ManufacturerDto.cs
similarity index 91%
rename from Dto/HStation.Dto.Assets.Core/09-Manufacturer/ManufacturerDto.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/ManufacturerDto.cs
index d4b08d0..7c35776 100644
--- a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/ManufacturerDto.cs
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/ManufacturerDto.cs
@@ -11,13 +11,13 @@
public AssetsManufacturerDto(Model.AssetsManufacturer rhs)
{
this.ID = rhs.ID;
+ this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -25,6 +25,11 @@
public long ID { get; set; }
/// <summary>
+ /// 绯诲垪ID
+ /// </summary>
+ public long SeriesID { get; set; }
+
+ /// <summary>
/// 鍚嶇О
/// </summary>
public string Name { get; set; }
diff --git a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/UpdateManufacturerInput.cs
similarity index 92%
rename from Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/UpdateManufacturerInput.cs
index 1a16c5d..0a958d4 100644
--- a/Dto/HStation.Dto.Assets.Core/09-Manufacturer/UpdateManufacturerInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-Manufacturer/UpdateManufacturerInput.cs
@@ -16,6 +16,11 @@
public string Name { get; set; }
/// <summary>
+ /// 绯诲垪ID
+ /// </summary>
+ public long SeriesID { get; set; }
+
+ /// <summary>
/// 鑱旂郴浜�
/// </summary>
public string Contacter { get; set; }
diff --git a/Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/AddManufacturerMappingInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/AddManufacturerMappingInput.cs
similarity index 100%
rename from Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/AddManufacturerMappingInput.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/AddManufacturerMappingInput.cs
diff --git a/Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/ManufacturerMappingDto.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/ManufacturerMappingDto.cs
similarity index 100%
rename from Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/ManufacturerMappingDto.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/ManufacturerMappingDto.cs
diff --git a/Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/UpdateManufacturerMappingInput.cs b/Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/UpdateManufacturerMappingInput.cs
similarity index 100%
rename from Dto/HStation.Dto.Assets.Core/10-ManufacturerMapping/UpdateManufacturerMappingInput.cs
rename to Dto/HStation.Dto.Assets.Core/09-Manufacturer/02-ManufacturerMapping/UpdateManufacturerMappingInput.cs
diff --git a/Dto/HStation.Dto.Assets.Core/HStation.Dto.Assets.Core.csproj b/Dto/HStation.Dto.Assets.Core/HStation.Dto.Assets.Core.csproj
index 76f4284..553cdff 100644
--- a/Dto/HStation.Dto.Assets.Core/HStation.Dto.Assets.Core.csproj
+++ b/Dto/HStation.Dto.Assets.Core/HStation.Dto.Assets.Core.csproj
@@ -17,10 +17,13 @@
<ItemGroup>
<Compile Remove="01-Valve\02-ValveGroup\**" />
<Compile Remove="01-Valve\04-ValveMaping\**" />
+ <Compile Remove="09-Manufacturer\02-ManufacturerMapping\**" />
<EmbeddedResource Remove="01-Valve\02-ValveGroup\**" />
<EmbeddedResource Remove="01-Valve\04-ValveMaping\**" />
+ <EmbeddedResource Remove="09-Manufacturer\02-ManufacturerMapping\**" />
<None Remove="01-Valve\02-ValveGroup\**" />
<None Remove="01-Valve\04-ValveMaping\**" />
+ <None Remove="09-Manufacturer\02-ManufacturerMapping\**" />
</ItemGroup>
<ItemGroup>
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpGroup.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroup.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpGroup.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroup.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpGroupAndMainMapping.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroupAndMainMapping.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpGroupAndMainMapping.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpGroupAndMainMapping.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpMain.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMain.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpMain.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMain.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpMainAndPartMapping.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMainAndPartMapping.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpMainAndPartMapping.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpMainAndPartMapping.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpPartMain.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPartMain.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpPartMain.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPartMain.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpPropContent.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpPropContent.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeries.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeries.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeries.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeriesManufacturerMapping.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesManufacturerMapping.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeriesManufacturerMapping.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesManufacturerMapping.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeriesTypeMapping.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesTypeMapping.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpSeriesTypeMapping.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpSeriesTypeMapping.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpType.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpType.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/01-entity/01-PumpMain/AssetsPumpType.cs
rename to Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpType.cs
diff --git a/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs
index 5d90ef6..0899302 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturer.cs
@@ -6,9 +6,9 @@
/// <summary>
/// 鍘傚晢
/// </summary>
- [SysType("assets_Manufacturer")]
- [SugarTable("assets_Manufacturer")]
- public class AssetsManufacturer : BaseEntity, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
+ [SysType("assets_manufacturer")]
+ [SugarTable("assets_manufacturer")]
+ public class AssetsManufacturer : BaseEntity, IFlags, ITagName, ISorter, System.ICloneable
{
public AssetsManufacturer()
{ }
@@ -16,12 +16,12 @@
public AssetsManufacturer(AssetsManufacturer rhs) : base(rhs)
{
this.Name = rhs.Name;
+ this.SeriesID = rhs.SeriesID;
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -29,13 +29,13 @@
public void Reset(AssetsManufacturer rhs)
{
this.ID = rhs.ID;
+ this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -43,55 +43,46 @@
/// <summary>
/// 鍚嶇О
/// </summary>
- [Display(Name = "鍚嶇О")]
public string Name { get; set; }
+
+ /// <summary>
+ /// 绯诲垪ID
+ /// </summary>
+ public long SeriesID { get; set; }
/// <summary>
/// 鑱旂郴浜�
/// </summary>
- [Display(Name = "鑱旂郴浜�")]
public string Contacter { get; set; }
/// <summary>
/// 鑱旂郴鐢佃瘽
/// </summary>
- [Display(Name = "鑱旂郴鐢佃瘽")]
public string Telephone { get; set; }
/// <summary>
/// 鍦板潃
/// </summary>
- [Display(Name = "鍦板潃")]
public string Address { get; set; }
/// <summary>
/// 鏍囩
/// </summary>
- [Display(Name = "鏍囩")]
public string Flags { get; set; }
/// <summary>
/// 鏍囩鍚嶇О
/// </summary>
- [Display(Name = "鏍囩鍚嶇О")]
public string TagName { get; set; }
-
- /// <summary>
- /// 浣跨敤鐘舵��
- /// </summary>
- [Display(Name = "浣跨敤鐘舵��")]
- public int UseStatus { get; set; }
/// <summary>
/// 鎺掑簭鐮�
/// </summary>
- [Display(Name = "鎺掑簭鐮�")]
public int SortCode { get; set; }
/// <summary>
/// 璇存槑
/// </summary>
- [Display(Name = "璇存槑")]
public string Description { get; set; }
/// <summary>
diff --git a/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerMapping.cs b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerMapping.cs
index 3ceaab9..bc038b5 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerMapping.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerMapping.cs
@@ -6,8 +6,8 @@
/// <summary>
/// 鍘傚晢
/// </summary>
- [SysType("assets_Manufacturer_mapping")]
- [SugarTable("assets_Manufacturer_mapping")]
+ [SysType("assets_manufacturer_mapping")]
+ [SugarTable("assets_manufacturer_mapping")]
public class AssetsManufacturerMapping : BaseEntity, System.ICloneable
{
public AssetsManufacturerMapping()
diff --git a/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerSeries.cs b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerSeries.cs
new file mode 100644
index 0000000..b6274f8
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/01-entity/09-Manufacturer/AssetsManufacturerSeries.cs
@@ -0,0 +1,87 @@
+锘縰sing Yw.Entity;
+
+namespace HStation.Entity
+{
+ /// <summary>
+ /// 闃�闂ㄧ郴鍒�
+ /// </summary>
+ [SysType("assets_manufacturer_series")]
+ [SugarTable("assets_manufacturer_series")]
+ public class AssetsManufacturerSeries : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsManufacturerSeries()
+ { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsManufacturerSeries(AssetsManufacturerSeries rhs) : base(rhs)
+ {
+ this.ParentIds = rhs.ParentIds;
+ this.CatalogID = rhs.CatalogID;
+ this.Name = rhs.Name;
+ this.Paras = rhs.Paras;
+ this.Flags = rhs.Flags;
+ this.TagName = rhs.TagName;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
+ }
+
+ /// <summary>
+ /// 鐖剁骇id鍒楄〃锛堢増鏈帶鍒讹級
+ /// </summary>
+ [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = true)]
+ public string ParentIds { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public string Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsPumpSeries Clone()
+ {
+ return (AssetsPumpSeries)this.MemberwiseClone();
+ }
+
+ object ICloneable.Clone()
+ {
+ return this.MemberwiseClone();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/02-model/08-Valve/AssetsValveCoefficient.cs b/Service/HStation.Service.Assets.Core/02-model/08-Valve/AssetsValveCoefficient.cs
index 5922e1e..ddee025 100644
--- a/Service/HStation.Service.Assets.Core/02-model/08-Valve/AssetsValveCoefficient.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/08-Valve/AssetsValveCoefficient.cs
@@ -1,6 +1,4 @@
-锘縰sing HStation.Assets;
-using System.Runtime.CompilerServices;
-using Yw.Model;
+锘縰sing Yw.Model;
namespace HStation.Model
{
diff --git a/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs
index 9baef35..20012bd 100644
--- a/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturer.cs
@@ -6,7 +6,7 @@
/// <summary>
/// 鍘傚晢
/// </summary>
- [SysType("assets_Manufacturer")]
+ [SysType("assets_manufacturer")]
public class AssetsManufacturer : BaseModel, ISorter, ITagName, IFlags, System.ICloneable
{
public AssetsManufacturer()
@@ -18,9 +18,9 @@
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
+ this.SeriesID = rhs.SeriesID;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -32,9 +32,9 @@
this.Contacter = rhs.Contacter;
this.Telephone = rhs.Telephone;
this.Address = rhs.Address;
+ this.SeriesID = rhs.SeriesID;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
- this.UseStatus = rhs.UseStatus;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -42,55 +42,46 @@
/// <summary>
/// 鍚嶇О
/// </summary>
- [Display(Name = "鍚嶇О")]
public string Name { get; set; }
+
+ /// <summary>
+ /// 绯诲垪ID
+ /// </summary>
+ public long SeriesID { get; set; }
/// <summary>
/// 鑱旂郴浜�
/// </summary>
- [Display(Name = "鑱旂郴浜�")]
public string Contacter { get; set; }
/// <summary>
/// 鑱旂郴鐢佃瘽
/// </summary>
- [Display(Name = "鑱旂郴鐢佃瘽")]
public string Telephone { get; set; }
/// <summary>
/// 鍦板潃
/// </summary>
- [Display(Name = "鍦板潃")]
public string Address { get; set; }
/// <summary>
/// 鏍囩鍒楄〃
/// </summary>
- [Display(Name = "鏍囩鍒楄〃")]
public List<string> Flags { get; set; }
/// <summary>
/// 鏍囩鍚嶇О
/// </summary>
- [Display(Name = "鏍囩鍚嶇О")]
public string TagName { get; set; }
-
- /// <summary>
- /// 浣跨敤鐘舵��
- /// </summary>
- [Display(Name = "浣跨敤鐘舵��")]
- public Yw.Model.eUseStatus UseStatus { get; set; }
/// <summary>
/// 鎺掑簭鐮�
/// </summary>
- [Display(Name = "鎺掑簭鐮�")]
public int SortCode { get; set; }
/// <summary>
/// 璇存槑
/// </summary>
- [Display(Name = "璇存槑")]
public string Description { get; set; }
/// <summary>
diff --git a/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerMapping.cs b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerMapping.cs
index ceadcd4..16d28d0 100644
--- a/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerMapping.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerMapping.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鍘傚晢
/// </summary>
- [SysType("assets_AssetsManufacturer_mapping")]
+ [SysType("assets_manufacturer_mapping")]
public class AssetsManufacturerMapping : BaseModel, System.ICloneable
{
public AssetsManufacturerMapping()
diff --git a/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerSeries.cs b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerSeries.cs
new file mode 100644
index 0000000..29a70c9
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/02-model/09-Manufacturer/AssetsManufacturerSeries.cs
@@ -0,0 +1,99 @@
+锘縰sing Yw.Model;
+
+namespace HStation.Model
+{
+ /// <summary>
+ /// 绯诲垪
+ /// </summary>
+ [SysType("assets_manufacturer_series")]
+ public class AssetsManufacturerSeries : BaseModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsManufacturerSeries()
+ { }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsManufacturerSeries(AssetsManufacturerSeries rhs) : base(rhs)
+ {
+ this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
+ this.CatalogID = rhs.CatalogID;
+ this.Name = rhs.Name;
+ this.Paras = rhs.Paras;
+ this.Flags = rhs.Flags;
+ this.TagName = rhs.TagName;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
+ }
+
+ public void Reset(AssetsManufacturerSeries rhs)
+ {
+ this.ID = rhs.ID;
+ this.ParentIds = rhs.ParentIds;
+ this.CatalogID = rhs.CatalogID;
+ this.Name = rhs.Name;
+ this.Paras = rhs.Paras;
+ this.Flags = rhs.Flags;
+ this.TagName = rhs.TagName;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
+ }
+
+ /// <summary>
+ /// 鐖剁骇id鍒楄〃
+ /// </summary>
+ public List<long> ParentIds { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public AssetsManufacturerSeries Clone()
+ {
+ return (AssetsManufacturerSeries)this.MemberwiseClone();
+ }
+
+ object ICloneable.Clone()
+ {
+ return this.MemberwiseClone();
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IAssetsValveSeries.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IAssetsValveSeries.cs
new file mode 100644
index 0000000..8e11c24
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IAssetsValveSeries.cs
@@ -0,0 +1,11 @@
+锘縰sing Yw.DAL;
+
+namespace HStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public interface IAssetsManufacturerSeries : IBaseDAL<Entity.AssetsManufacturerSeries>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+ {
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IManufacturer.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IManufacturer.cs
index 13f1526..b5b9b64 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IManufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/01-interface/10-IManufacturer/IManufacturer.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public interface IAssetsManufacturer : IBaseDAL<Entity.AssetsManufacturer>, IUpdateSorter, IUpdateUseStatus
+ public interface IAssetsManufacturer : IBaseDAL<Entity.AssetsManufacturer>, IUpdateSorter
{
}
}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitMain.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitMain.cs
deleted file mode 100644
index 19c3059..0000000
--- a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitMain.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing Yw.DAL;
-
-namespace HStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public interface IAssetsKitMain : IBaseDAL<Entity.AssetsPackageMain>, IUpdateSorter
- {
- }
-}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitPumpMapping.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitPumpMapping.cs
deleted file mode 100644
index f7176b3..0000000
--- a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsKitPumpMapping.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing Yw.DAL;
-
-namespace HStation.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public interface IAssetsKitPumpMapping : IBaseDAL<Entity.AssetsPackagePumpMapping>
- {
- }
-}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageMain.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageMain.cs
new file mode 100644
index 0000000..de52811
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageMain.cs
@@ -0,0 +1,11 @@
+锘縰sing Yw.DAL;
+
+namespace HStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public interface IAssetsPackageMain : IBaseDAL<Entity.AssetsPackageMain>, IUpdateSorter
+ {
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackagePumpMapping.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackagePumpMapping.cs
new file mode 100644
index 0000000..c90641f
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackagePumpMapping.cs
@@ -0,0 +1,11 @@
+锘縰sing Yw.DAL;
+
+namespace HStation.DAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public interface IAssetsPackagePumpMapping : IBaseDAL<Entity.AssetsPackagePumpMapping>
+ {
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsPackageSeries.cs b/Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageSeries.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Equipment/IAssetsPackageSeries.cs
rename to Service/HStation.Service.Assets.Core/04-dal/01-interface/13-Package/IAssetsPackageSeries.cs
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturer.cs
similarity index 85%
rename from Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs
rename to Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturer.cs
index 914c9bb..63af36e 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturer.cs
@@ -6,7 +6,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter_UseStatus<Entity.AssetsManufacturer>, IAssetsManufacturer
+ public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter<Entity.AssetsManufacturer>, IAssetsManufacturer
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturerSeries.cs
similarity index 63%
copy from Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs
copy to Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturerSeries.cs
index 914c9bb..e8d1296 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/10-Manufacturer/AssetsManufacturerSeries.cs
@@ -1,12 +1,11 @@
-锘縰sing Yw.DAL;
-using Yw.DAL.PostgreSql;
+锘縰sing Yw.DAL.PostgreSql;
namespace HStation.DAL.PostgreSql
{
/// <summary>
///
/// </summary>
- public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter_UseStatus<Entity.AssetsManufacturer>, IAssetsManufacturer
+ public partial class AssetsManufacturerSeries : BaseDAL_Paras_Flags_TagName_Sorter<Entity.AssetsManufacturerSeries>, IAssetsManufacturerSeries
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackageMain.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackageMain.cs
index d765e06..e64a23f 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackageMain.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackageMain.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsPackageMain : BaseDAL_Sorter<Entity.AssetsPackageMain>, IAssetsKitMain
+ public partial class AssetsPackageMain : BaseDAL_Sorter<Entity.AssetsPackageMain>, IAssetsPackageMain
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackagePumpMapping.cs b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackagePumpMapping.cs
index 74f2f5a..56d0393 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackagePumpMapping.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/02-postgresql/13-Package/AssetsPackagePumpMapping.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsPackagePumpMapping : BaseDAL<Entity.AssetsPackagePumpMapping>, IAssetsKitPumpMapping
+ public partial class AssetsPackagePumpMapping : BaseDAL<Entity.AssetsPackagePumpMapping>, IAssetsPackagePumpMapping
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturer.cs
similarity index 84%
rename from Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs
rename to Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturer.cs
index 9e4dd8e..4b96e15 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturer.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter_UseStatus<Entity.AssetsManufacturer>, IAssetsManufacturer
+ public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter<Entity.AssetsManufacturer>, IAssetsManufacturer
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturerSeries.cs
similarity index 68%
copy from Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs
copy to Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturerSeries.cs
index 9e4dd8e..91372d1 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/10-Manufacturer/AssetsManufacturerSeries.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsManufacturer : BaseDAL_Flags_TagName_Sorter_UseStatus<Entity.AssetsManufacturer>, IAssetsManufacturer
+ public partial class AssetsManufacturerSeries : BaseDAL_Paras_Flags_TagName_Sorter<Entity.AssetsManufacturerSeries>, IAssetsManufacturerSeries
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackageMain.cs b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackageMain.cs
index ba29775..c642069 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackageMain.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackageMain.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsPackageMain : BaseDAL_Sorter<Entity.AssetsPackageMain>, IAssetsKitMain
+ public partial class AssetsPackageMain : BaseDAL_Sorter<Entity.AssetsPackageMain>, IAssetsPackageMain
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackagePumpMapping.cs b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackagePumpMapping.cs
index afb0c13..74b06a9 100644
--- a/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackagePumpMapping.cs
+++ b/Service/HStation.Service.Assets.Core/04-dal/03-sqlite/14-Kit/AssetsPackagePumpMapping.cs
@@ -5,7 +5,7 @@
/// <summary>
///
/// </summary>
- public partial class AssetsPackagePumpMapping : BaseDAL<Entity.AssetsPackagePumpMapping>, IAssetsKitPumpMapping
+ public partial class AssetsPackagePumpMapping : BaseDAL<Entity.AssetsPackagePumpMapping>, IAssetsPackagePumpMapping
{
/// <summary>
///
diff --git a/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs b/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs
index 87c21a1..c82c0e5 100644
--- a/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/00-core/03-helper/DbFirstHelper.cs
@@ -84,7 +84,7 @@
//鍘傚晢
typeof(Entity.AssetsManufacturer),
- typeof(Entity.AssetsManufacturerMapping),
+ typeof(Entity.AssetsManufacturerSeries),
//鑷畾涔�
typeof(Entity.AssetsUserDefined),
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries.cs
new file mode 100644
index 0000000..2d0078f
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries.cs
@@ -0,0 +1,363 @@
+锘縩amespace HStation.Service
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class AssetsManufacturerSeries
+ {
+ #region Cache
+
+ //鑾峰彇缂撳瓨
+ private static List<Model.AssetsManufacturerSeries> GetCache()
+ {
+ var all = AssetsManufacturerSeriesCacheHelper.GetSet(() =>
+ {
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var entity_list = dal.GetAll();
+ var model_list = Entity2Models(entity_list);
+ if (model_list == null)
+ {
+ model_list = new List<Model.AssetsManufacturerSeries>();
+ }
+ return model_list;
+ }, Yw.Service.ConfigHelper.CacheKeepTime, Yw.Service.ConfigHelper.CacheRandomTime);
+ return all;
+ }
+
+ //閫氳繃 ID 鏇存柊缂撳瓨
+ private static void UpdateCache(long ID)
+ {
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var entity_ds = dal.GetByID(ID);
+ var model_ds = Entity2Model(entity_ds);
+ var all = GetCache();
+ var model = all.Find(x => x.ID == ID);
+ if (model == null)
+ {
+ all.Add(model_ds);
+ }
+ else
+ {
+ model.Reset(model_ds);
+ }
+ AssetsManufacturerSeriesCacheHelper.Trigger();
+ }
+
+ //閫氳繃 Ids 鏇存柊缂撳瓨
+ private static void UpdateCache(List<long> Ids)
+ {
+ if (Ids == null || Ids.Count < 1)
+ {
+ return;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var entity_list = dal.GetByIds(Ids);
+ var model_list = Entity2Models(entity_list);
+ var all = GetCache();
+ all.RemoveAll(x => Ids.Contains(x.ID));
+ if (model_list != null && model_list.Count > 0)
+ {
+ all.AddRange(model_list);
+ }
+ AssetsManufacturerSeriesCacheHelper.Trigger();
+ }
+
+ //绉婚櫎缂撳瓨
+ private static void RemoveCache(long ID)
+ {
+ var all = GetCache();
+ all.RemoveAll(x => x.ID == ID);
+ AssetsManufacturerSeriesCacheHelper.Trigger();
+ }
+
+ /// <summary>
+ /// 鍙戝竷缂撳瓨
+ /// </summary>
+ public static void PublishCache(string key)
+ {
+ AssetsManufacturerSeriesCacheHelper.Publish(key);
+ }
+
+ #endregion Cache
+
+ #region Query
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ public List<Model.AssetsManufacturerSeries> GetAll()
+ {
+ var all = GetCache();
+ return all.OrderBy(x => x.SortCode).ToList();
+ }
+
+ /// <summary>
+ /// 閫氳繃 ID 鑾峰彇
+ /// </summary>
+ public Model.AssetsManufacturerSeries GetByID(long ID)
+ {
+ var all = GetAll();
+ return all.Find(x => x.ID == ID);
+ }
+
+ /// <summary>
+ /// 閫氳繃 ID 鑾峰彇
+ /// </summary>
+ public List<Model.AssetsManufacturerSeries> GetByIds(List<long> Ids)
+ {
+ if (Ids == null || Ids.Count < 1)
+ {
+ return default;
+ }
+ var all = GetAll();
+ return all.Where(x => Ids.Contains(x.ID)).OrderBy(x => x.SortCode).ToList();
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏈�澶ф帓搴忕爜
+ /// </summary>
+ public int GetMaxSortCode()
+ {
+ var all = GetAll();
+ if (all == null || all.Count < 1)
+ {
+ return 0;
+ }
+ return all.Max(x => x.SortCode);
+ }
+
+ #endregion Query
+
+ #region Insert
+
+ /// <summary>
+ /// 鎻掑叆涓�鏉℃暟鎹�
+ /// </summary>
+ public long Insert(Model.AssetsManufacturerSeries model)
+ {
+ if (model == null)
+ {
+ return default;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var entity = Model2Entity(model);
+ var id = dal.Insert(entity);
+ if (id > 0)
+ {
+ UpdateCache(id);
+ }
+ return id;
+ }
+
+ /// <summary>
+ /// 鎻掑叆澶氭潯
+ /// </summary>
+ public bool Inserts(List<Model.AssetsManufacturerSeries> list)
+ {
+ if (list == null || list.Count < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var entity_list = Model2Entities(list);
+ var ids = dal.InsertsR(entity_list);
+ if (ids != null && ids.Count > 0)
+ {
+ UpdateCache(ids);
+ return true;
+ }
+ return false;
+ }
+
+ #endregion Insert
+
+ #region Update
+
+ /// <summary>
+ /// 鏇存柊涓�鏉�
+ /// </summary>
+ public bool Update(Model.AssetsManufacturerSeries model)
+ {
+ if (model == null)
+ {
+ return false;
+ }
+ var entity = Model2Entity(model);
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.Update(entity);
+ if (bol)
+ {
+ UpdateCache(model.ID);
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鎵归噺鏇存柊
+ /// </summary>
+ public bool Updates(List<Model.AssetsManufacturerSeries> list)
+ {
+ if (list == null || list.Count < 1)
+ {
+ return false;
+ }
+ if (list.Exists(x => x.ID < 1))
+ {
+ return false;
+ }
+ var entity_list = Model2Entities(list);
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.Updates(entity_list);
+ if (bol)
+ {
+ UpdateCache(list.Select(x => x.ID).ToList());
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊鎺掑簭鐮�
+ /// </summary>
+ public bool UpdateSortCode(long ID, int SortCode)
+ {
+ if (ID < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.UpdateSortCode(ID, SortCode);
+ if (bol)
+ {
+ UpdateCache(ID);
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊鎺掑簭
+ /// </summary>
+ public bool UpdateSorter(List<Yw.Model.Sorter> sorters)
+ {
+ if (sorters == null || sorters.Count < 1)
+ {
+ return false;
+ }
+ if (sorters.Exists(x => x.ID < 1))
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.UpdateSorter(sorters.ToEntityList());
+ if (bol)
+ {
+ UpdateCache(sorters.Select(x => x.ID).ToList());
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊 Paras
+ /// </summary>
+ public bool UpdateParas(long ID, Dictionary<string, string> Paras)
+ {
+ if (ID < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.UpdateParas(ID, ParasHelper.ToString(Paras));
+ if (bol)
+ {
+ UpdateCache(ID);
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊 Flags
+ /// </summary>
+ public bool UpdateFlags(long ID, List<string> Flags)
+ {
+ if (ID < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.UpdateFlags(ID, FlagsHelper.ToString(Flags));
+ if (bol)
+ {
+ UpdateCache(ID);
+ }
+ return bol;
+ }
+
+ /// <summary>
+ /// 鏇存柊 TagName
+ /// </summary>
+ public bool UpdateTagName(long ID, string TagName)
+ {
+ if (ID < 1)
+ {
+ return false;
+ }
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.UpdateTagName(ID, TagName);
+ if (bol)
+ {
+ UpdateCache(ID);
+ }
+ return bol;
+ }
+
+ #endregion Update
+
+ #region Exist
+
+ /// <summary>
+ /// 鍒ゆ柇 TagName 鏄惁瀛樺湪
+ /// </summary>
+ public bool IsExistTagName(string TagName)
+ {
+ if (string.IsNullOrEmpty(TagName))
+ {
+ return false;
+ }
+ var all = GetAll();
+ return all.Exists(x => x.TagName == TagName);
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇 TagName 鏄惁瀛樺湪 ExceptID
+ /// </summary>
+ public bool IsExistTagNameExceptID(string TagName, long ExceptID)
+ {
+ if (string.IsNullOrEmpty(TagName))
+ {
+ return false;
+ }
+ var all = GetAll();
+ return all.Exists(x => x.TagName == TagName && x.ID != ExceptID);
+ }
+
+ #endregion Exist
+
+ #region Delete
+
+ /// <summary>
+ /// 閫氳繃 ID 鍒犻櫎
+ /// </summary>
+ public bool DeleteByID(long ID, out string Msg)
+ {
+ Msg = string.Empty;
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturerSeries>();
+ var bol = dal.DeleteByID(ID);
+ if (bol)
+ {
+ RemoveCache(ID);
+ }
+ return bol;
+ }
+
+ #endregion Delete
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries_Instance.cs
new file mode 100644
index 0000000..a3e472e
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/AssetsManufacturerSeries_Instance.cs
@@ -0,0 +1,63 @@
+锘縰sing SqlSugar;
+
+namespace HStation.Service
+{
+ public partial class AssetsManufacturerSeries
+ {
+ //Entity to GetModel
+ internal static Model.AssetsManufacturerSeries Entity2Model(Entity.AssetsManufacturerSeries entity)
+ {
+ if (entity == null)
+ return default;
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsManufacturerSeries, Model.AssetsManufacturerSeries>()
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToList(src.ParentIds)))
+ .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
+ .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
+ ).CreateMapper();
+ var model = mapper.Map<Entity.AssetsManufacturerSeries, Model.AssetsManufacturerSeries>(entity);
+ return model;
+ }
+
+ //Entities to GetModels
+ internal static List<Model.AssetsManufacturerSeries> Entity2Models(List<Entity.AssetsManufacturerSeries> entities)
+ {
+ if (entities == null || entities.Count < 1)
+ return default;
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.AssetsManufacturerSeries, Model.AssetsManufacturerSeries>()
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToList(src.ParentIds)))
+ .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToDictionary(src.Paras)))
+ .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToList(src.Flags)))
+ ).CreateMapper();
+ var models = mapper.Map<List<Entity.AssetsManufacturerSeries>, List<Model.AssetsManufacturerSeries>>(entities);
+ return models;
+ }
+
+ //Model to Entity
+ internal static Entity.AssetsManufacturerSeries Model2Entity(Model.AssetsManufacturerSeries model)
+ {
+ if (model == null)
+ return default;
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsManufacturerSeries, Entity.AssetsManufacturerSeries>()
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToString(src.ParentIds)))
+ .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+ .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
+ ).CreateMapper();
+ var entity = mapper.Map<Model.AssetsManufacturerSeries, Entity.AssetsManufacturerSeries>(model);
+ return entity;
+ }
+
+ //Models to Entities
+ internal static List<Entity.AssetsManufacturerSeries> Model2Entities(List<Model.AssetsManufacturerSeries> models)
+ {
+ if (models == null || models.Count < 1)
+ return default;
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.AssetsManufacturerSeries, Entity.AssetsManufacturerSeries>()
+ .ForMember(d => d.ParentIds, opt => opt.MapFrom(src => TreeParentIdsHelper.ToString(src.ParentIds)))
+ .ForMember(d => d.Paras, opt => opt.MapFrom(src => ParasHelper.ToString(src.Paras)))
+ .ForMember(d => d.Flags, opt => opt.MapFrom(src => FlagsHelper.ToString(src.Flags)))
+ ).CreateMapper();
+ var entities = mapper.Map<List<Model.AssetsManufacturerSeries>, List<Entity.AssetsManufacturerSeries>>(models);
+ return entities;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/Cache/ManufacturerSeriesCacheHelper.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/Cache/ManufacturerSeriesCacheHelper.cs
new file mode 100644
index 0000000..8dfb820
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/01-ManufacturerSeries/Cache/ManufacturerSeriesCacheHelper.cs
@@ -0,0 +1,71 @@
+锘縩amespace HStation.Service
+{
+ /// <summary>
+ /// AssetsManufacturerSeries
+ /// 缂撳瓨杈呭姪绫�
+ /// </summary>
+ internal class AssetsManufacturerSeriesCacheHelper
+ {
+ private const string _contentKey = "AssetsManufacturerSeriesList";
+
+ internal static string GetCacheKey()
+ {
+ return CacheHelper.GetCacheKey(_contentKey);
+ }
+
+ /// <summary>
+ /// 璁剧疆缂撳瓨
+ /// </summary>
+ public static void Set(List<Model.AssetsManufacturerSeries> list, int Minites = 30, int RandomSeconds = 0)
+ {
+ var cacheKey = GetCacheKey();
+ MemoryCacheHelper.Set(cacheKey, list, Minites * 60 + RandomSeconds);
+ }
+
+ /// <summary>
+ /// 鑾峰彇缂撳瓨
+ /// </summary>
+ /// <returns></returns>
+ public static List<Model.AssetsManufacturerSeries> Get()
+ {
+ var cacheKey = GetCacheKey();
+ return MemoryCacheHelper.Get<List<Model.AssetsManufacturerSeries>>(cacheKey);
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁剧疆缂撳瓨
+ /// </summary>
+ public static List<Model.AssetsManufacturerSeries> GetSet(Func<List<Model.AssetsManufacturerSeries>> func, int Minites = 30, int RandomSeconds = 0)
+ {
+ var cacheKey = GetCacheKey();
+ return MemoryCacheHelper.GetSet(cacheKey, func, Minites * 60 + RandomSeconds);
+ }
+
+ /// <summary>
+ /// 绉婚櫎缂撳瓨
+ /// </summary>
+ public static void Remove()
+ {
+ var cacheKey = GetCacheKey();
+ MemoryCacheHelper.Remove(cacheKey);
+ }
+
+ /// <summary>
+ /// 鍙戝竷
+ /// </summary>
+ public static void Publish(string key)
+ {
+ var cacheKey = GetCacheKey();
+ MemoryCacheWipeRelationHelper.Set(key, cacheKey);
+ }
+
+ /// <summary>
+ /// 瑙﹀彂
+ /// </summary>
+ public static void Trigger()
+ {
+ var cacheKey = GetCacheKey();
+ MemoryCacheWipeRelationHelper.Trigger(cacheKey);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Cache/ManufacturerCacheHelper.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Cache/ManufacturerCacheHelper.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Cache/ManufacturerCacheHelper.cs
rename to Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Cache/ManufacturerCacheHelper.cs
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Manufacturer.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer.cs
similarity index 93%
rename from Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Manufacturer.cs
rename to Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer.cs
index afc5d65..b0ef042 100644
--- a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Manufacturer.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer.cs
@@ -193,22 +193,6 @@
}
/// <summary>
- /// 鏇存柊 UseStatus
- /// </summary>
- public bool UpdateUseStatus(long id, int useStatus)
- {
- if (id < 1)
- return false;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsManufacturer>();
- var bol = dal.UpdateUseStatus(id, useStatus);
- if (bol)
- {
- UpdateCache(id);
- }
- return bol;
- }
-
- /// <summary>
/// 鎵归噺鏇存柊
/// </summary>
public bool Updates(List<Model.AssetsManufacturer> list)
diff --git a/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Manufacturer_Instance.cs b/Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer_Instance.cs
similarity index 100%
rename from Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/Main/Manufacturer_Instance.cs
rename to Service/HStation.Service.Assets.Core/05-service/10-Manufacturer/02-Manufacturer/Manufacturer_Instance.cs
diff --git a/Service/HStation.Service.Assets.Core/05-service/13-Package/01-PackageMain/AssetsPackageMain.cs b/Service/HStation.Service.Assets.Core/05-service/13-Package/01-PackageMain/AssetsPackageMain.cs
index f57997b..5c65c3b 100644
--- a/Service/HStation.Service.Assets.Core/05-service/13-Package/01-PackageMain/AssetsPackageMain.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/13-Package/01-PackageMain/AssetsPackageMain.cs
@@ -12,7 +12,7 @@
{
var all = AssetsPackageMainCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
@@ -27,7 +27,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -50,7 +50,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -152,7 +152,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -171,7 +171,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -196,7 +196,7 @@
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var bol = dal.Update(entity);
if (bol)
{
@@ -219,7 +219,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -238,7 +238,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitMain>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackageMain>();
var bol = dal.DeleteByID(ID);
if (bol)
{
diff --git a/Service/HStation.Service.Assets.Core/05-service/13-Package/03-PackageMapping/AssetsPackagePumpMapping.cs b/Service/HStation.Service.Assets.Core/05-service/13-Package/03-PackageMapping/AssetsPackagePumpMapping.cs
index 0450870..3dd6bd1 100644
--- a/Service/HStation.Service.Assets.Core/05-service/13-Package/03-PackageMapping/AssetsPackagePumpMapping.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/13-Package/03-PackageMapping/AssetsPackagePumpMapping.cs
@@ -12,7 +12,7 @@
{
var all = AssetsPackagePumpMappingCacheHelper.GetSet(() =>
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var entity_list = dal.GetAll();
var model_list = Entity2Models(entity_list);
if (model_list == null)
@@ -27,7 +27,7 @@
//閫氳繃 ID 鏇存柊缂撳瓨
private static void UpdateCache(long ID)
{
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var entity_ds = dal.GetByID(ID);
var model_ds = Entity2Model(entity_ds);
var all = GetCache();
@@ -50,7 +50,7 @@
{
return;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var entity_list = dal.GetByIds(Ids);
var model_list = Entity2Models(entity_list);
var all = GetCache();
@@ -101,9 +101,9 @@
}
/// <summary>
- /// 閫氳繃Kit ID 鑾峰彇
+ /// 閫氳繃Package ID 鑾峰彇
/// </summary>
- public List<Model.AssetsPackagePumpMapping> GetByKitID(long ID)
+ public List<Model.AssetsPackagePumpMapping> GetByPackageID(long ID)
{
var all = GetAll();
return all.Where(x => x.EquipmentMainID == ID).ToList();
@@ -135,7 +135,7 @@
{
return default;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var entity = Model2Entity(model);
var id = dal.Insert(entity);
if (id > 0)
@@ -154,7 +154,7 @@
{
return false;
}
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var entity_list = Model2Entities(list);
var ids = dal.InsertsR(entity_list);
if (ids != null && ids.Count > 0)
@@ -179,7 +179,7 @@
return false;
}
var entity = Model2Entity(model);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var bol = dal.Update(entity);
if (bol)
{
@@ -202,7 +202,7 @@
return false;
}
var entity_list = Model2Entities(list);
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var bol = dal.Updates(entity_list);
if (bol)
{
@@ -221,7 +221,7 @@
public bool DeleteByID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
var bol = dal.DeleteByID(ID);
if (bol)
{
@@ -233,11 +233,11 @@
/// <summary>
/// 閫氳繃 鎴愬璁惧ID 鍒犻櫎
/// </summary>
- public bool DeleteByKItID(long ID, out string Msg)
+ public bool DeleteByPackageID(long ID, out string Msg)
{
Msg = string.Empty;
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsKitPumpMapping>();
- var ids = GetByKitID(ID).Select(x => x.ID).ToList();
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPackagePumpMapping>();
+ var ids = GetByPackageID(ID).Select(x => x.ID).ToList();
var bol = dal.DeleteByIds(ids);
if (bol)
{
diff --git a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
index 2c41da0..2a43189 100644
--- a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
+++ b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
@@ -7,29 +7,39 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="04-dal\03-sqlite\11-ManufacturerMapping\**" />
<Compile Remove="05-service\00-core\03-extensions\**" />
<Compile Remove="05-service\03-Valve\02-ValveGroup\**" />
<Compile Remove="05-service\03-Valve\04-AssetsPumpGroupAndMainMap\**" />
<Compile Remove="05-service\03-Valve\04-PumpGroupAndMainMap\**" />
+ <Compile Remove="05-service\10-Manufacturer\Mapping\**" />
+ <EmbeddedResource Remove="04-dal\03-sqlite\11-ManufacturerMapping\**" />
<EmbeddedResource Remove="05-service\00-core\03-extensions\**" />
<EmbeddedResource Remove="05-service\03-Valve\02-ValveGroup\**" />
<EmbeddedResource Remove="05-service\03-Valve\04-AssetsPumpGroupAndMainMap\**" />
<EmbeddedResource Remove="05-service\03-Valve\04-PumpGroupAndMainMap\**" />
+ <EmbeddedResource Remove="05-service\10-Manufacturer\Mapping\**" />
+ <None Remove="04-dal\03-sqlite\11-ManufacturerMapping\**" />
<None Remove="05-service\00-core\03-extensions\**" />
<None Remove="05-service\03-Valve\02-ValveGroup\**" />
<None Remove="05-service\03-Valve\04-AssetsPumpGroupAndMainMap\**" />
<None Remove="05-service\03-Valve\04-PumpGroupAndMainMap\**" />
+ <None Remove="05-service\10-Manufacturer\Mapping\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="01-entity\08-Valve\ValveGroup.cs" />
<Compile Remove="01-entity\08-Valve\ValveGroupAndMainMap.cs" />
+ <Compile Remove="01-entity\09-Manufacturer\AssetsManufacturerMapping.cs" />
<Compile Remove="02-model\08-Valve\ValveGroup.cs" />
<Compile Remove="02-model\08-Valve\ValveGroupAndMainMap.cs" />
+ <Compile Remove="02-model\09-Manufacturer\AssetsManufacturerMapping.cs" />
<Compile Remove="04-dal\01-interface\03-IValve\IValveGroup.cs" />
<Compile Remove="04-dal\01-interface\03-IValve\IValveGroupAndMainMap.cs" />
+ <Compile Remove="04-dal\01-interface\10-IManufacturer\IManufacturerMapping.cs" />
<Compile Remove="04-dal\02-postgresql\02-Valve\ValveGroup.cs" />
<Compile Remove="04-dal\02-postgresql\02-Valve\ValveGroupAndMainMap.cs" />
+ <Compile Remove="04-dal\02-postgresql\10-Manufacturer\ManufacturerMapping.cs" />
<Compile Remove="04-dal\03-sqlite\02-Valve\AssetsPumpGroup.cs" />
<Compile Remove="04-dal\03-sqlite\02-Valve\PumpGroup.cs" />
<Compile Remove="04-dal\03-sqlite\02-Valve\PumpMapGroupAndMain.cs" />
diff --git a/Vmo/HStation.Vmo.Assets.Core/10-Manufacturer/ManufacturerSeriesVmo.cs b/Vmo/HStation.Vmo.Assets.Core/10-Manufacturer/ManufacturerSeriesVmo.cs
new file mode 100644
index 0000000..4046e63
--- /dev/null
+++ b/Vmo/HStation.Vmo.Assets.Core/10-Manufacturer/ManufacturerSeriesVmo.cs
@@ -0,0 +1,50 @@
+锘縩amespace HStation.Vmo
+{
+ public class AssetsManufacturerSeriesVmo
+ {
+ /// <summary>
+ /// id
+ /// </summary>
+ public long ID { get; set; }
+
+ /// <summary>
+ /// 鐖剁骇ID
+ /// </summary>
+ public List<long> ParentIds { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
+
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+ /// <summary>
+ /// 璇存槑
+ /// </summary>
+ public string Description { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackageMainVmo.cs b/Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageMainVmo.cs
similarity index 100%
rename from Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackageMainVmo.cs
rename to Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageMainVmo.cs
diff --git a/Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackagePumpMappingVmo.cs b/Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackagePumpMappingVmo.cs
similarity index 100%
rename from Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackagePumpMappingVmo.cs
rename to Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackagePumpMappingVmo.cs
diff --git a/Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackageSeriesVmo.cs b/Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageSeriesVmo.cs
similarity index 100%
rename from Vmo/HStation.Vmo.Assets.Core/13-Kit/AssetsPackageSeriesVmo.cs
rename to Vmo/HStation.Vmo.Assets.Core/13-Package/AssetsPackageSeriesVmo.cs
diff --git a/Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj b/Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj
index 81d9e3b..8ccda63 100644
--- a/Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj
+++ b/Vmo/HStation.Vmo.Assets.Core/HStation.Vmo.Assets.Core.csproj
@@ -9,6 +9,7 @@
<ItemGroup>
<Compile Remove="02-Valve\ValveGroupAndMainMapVmo.cs" />
<Compile Remove="02-Valve\ValveGroupVmo.cs" />
+ <Compile Remove="10-Manufacturer\ManufacturerMapping.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/AddPipeLineSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/AddPipeLineSeriesDlg.cs
index 71d035b..383aef7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/AddPipeLineSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/AddPipeLineSeriesDlg.cs
@@ -18,9 +18,12 @@
{
_assetsPipeSeriesViews = new List<AssetsPipeSeriesViewModel>();
var allList = await new BLL.AssetsPipeSeries().GetAll();
- foreach (var item in allList)
+ if (allList != null)
{
- _assetsPipeSeriesViews.Add(new AssetsPipeSeriesViewModel(item));
+ foreach (var item in allList)
+ {
+ _assetsPipeSeriesViews.Add(new AssetsPipeSeriesViewModel(item));
+ }
}
treeListLookUpEdit1TreeList.DataSource = _assetsPipeSeriesViews;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/01-series/AddAssetsElbowSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/01-series/AddAssetsElbowSeriesDlg.cs
index 8a8fa1d..65d6f22 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/01-series/AddAssetsElbowSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/01-series/AddAssetsElbowSeriesDlg.cs
@@ -18,9 +18,12 @@
{
_assetsElbowSeriesViews = new List<AssetsElbowSeriesViewModel>();
var allList = await new BLL.AssetsElbowSeries().GetAll();
- foreach (var item in allList)
+ if (allList != null)
{
- _assetsElbowSeriesViews.Add(new AssetsElbowSeriesViewModel(item));
+ foreach (var item in allList)
+ {
+ _assetsElbowSeriesViews.Add(new AssetsElbowSeriesViewModel(item));
+ }
}
treeListLookUpEdit1TreeList.DataSource = _assetsElbowSeriesViews;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/AddAssetsThreelinkSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/AddAssetsThreelinkSeriesDlg.cs
index 3a82b5d..2455217 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/AddAssetsThreelinkSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/01-series/AddAssetsThreelinkSeriesDlg.cs
@@ -18,9 +18,12 @@
{
_assetsThreelinkSeriesViews = new List<AssetsThreelinkSeriesViewModel>();
var allList = await new BLL.AssetsThreelinkSeries().GetAll();
- foreach (var item in allList)
+ if (allList != null)
{
- _assetsThreelinkSeriesViews.Add(new AssetsThreelinkSeriesViewModel(item));
+ foreach (var item in allList)
+ {
+ _assetsThreelinkSeriesViews.Add(new AssetsThreelinkSeriesViewModel(item));
+ }
}
treeListLookUpEdit1TreeList.DataSource = _assetsThreelinkSeriesViews;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AddAssetsFourlinkSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AddAssetsFourlinkSeriesDlg.cs
index 801fee3..6ebf7db 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AddAssetsFourlinkSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/01-series/AddAssetsFourlinkSeriesDlg.cs
@@ -18,9 +18,12 @@
{
_assetsFourlinkSeriesViews = new List<AssetsFourlinkSeriesViewModel>();
var allList = await new BLL.AssetsFourlinkSeries().GetAll();
- foreach (var item in allList)
+ if (allList != null)
{
- _assetsFourlinkSeriesViews.Add(new AssetsFourlinkSeriesViewModel(item));
+ foreach (var item in allList)
+ {
+ _assetsFourlinkSeriesViews.Add(new AssetsFourlinkSeriesViewModel(item));
+ }
}
treeListLookUpEdit1TreeList.DataSource = _assetsFourlinkSeriesViews;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs
index 37b5907..05784f8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.cs
@@ -185,32 +185,6 @@
}*/
/// <summary>
- /// 浣跨敤鐘舵��
- /// </summary>
- private void barBtnUpdateUseStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var vm = this.gridView1.GetCurrentViewModel(_allBindingList);
- if (vm == null)
- {
- MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛岋紒");
- return;
- }
- var dlg = new SetUseStatusDlg();
- dlg.SetBindingData(vm.UseStatus);
- dlg.ReloadDataEvent += async (useStatus) =>
- {
- var result = await _bll.UpdateUseStatus(vm.ID, (int)useStatus);
- if (result)
- {
- vm.UseStatus = useStatus;
- this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
- }
- return result;
- };
- dlg.ShowDialog();
- }
-
- /// <summary>
/// 妫�绱�
/// </summary>
private void barCekSearch_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
index 709ea87..479142f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
@@ -41,7 +41,6 @@
barBtnUpdateSortCode = new DevExpress.XtraBars.BarButtonItem();
barBtnDetail = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateTagName = new DevExpress.XtraBars.BarButtonItem();
- barBtnUpdateUseStatus = new DevExpress.XtraBars.BarButtonItem();
barCekSearch = new DevExpress.XtraBars.BarCheckItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -69,9 +68,9 @@
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barCekSearch });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 27;
+ ribbonControl1.MaxItemId = 28;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -136,14 +135,6 @@
barBtnUpdateTagName.Name = "barBtnUpdateTagName";
barBtnUpdateTagName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // barBtnUpdateUseStatus
- //
- barBtnUpdateUseStatus.Caption = "浣跨敤鐘舵��";
- barBtnUpdateUseStatus.Id = 24;
- barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
- barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
- barBtnUpdateUseStatus.ItemClick += barBtnUpdateUseStatus_ItemClick;
- //
// barCekSearch
//
barCekSearch.Caption = "妫�绱�";
@@ -166,7 +157,6 @@
ribbonPageGroup1.ItemLinks.Add(barBtnDetail);
ribbonPageGroup1.ItemLinks.Add(barBtnUpdateTagName, true);
ribbonPageGroup1.ItemLinks.Add(barBtnUpdateSortCode);
- ribbonPageGroup1.ItemLinks.Add(barBtnUpdateUseStatus);
ribbonPageGroup1.ItemLinks.Add(barCekSearch);
ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup1.Name = "ribbonPageGroup1";
@@ -263,7 +253,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
Controls.Add(ribbonControl1);
- Name = "AssetsManufacturerMainPanel";
+ Name = "AssetsManufacturerMainPage";
Size = new Size(818, 681);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)gridControl1).EndInit();
@@ -285,7 +275,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnUpdateSortCode;
private DevExpress.XtraBars.BarButtonItem barBtnDetail;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateTagName;
- private DevExpress.XtraBars.BarButtonItem barBtnUpdateUseStatus;
private DevExpress.XtraBars.BarCheckItem barCekSearch;
private DevExpress.XtraGrid.GridControl gridControl1;
private BindingSource currentViewModelBindingSource;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.resx
index 5704196..1e3ec7a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.resx
@@ -269,38 +269,6 @@
LDE4eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
</data>
- <data name="barBtnUpdateUseStatus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMgFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
- aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
- c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
- O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
- ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
- c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJVc2VyIj4NCiAgICA8
- cGF0aCBkPSJNMTYuMiwyNkgydi0xLjVjMC03LjUsNS43LTUsOC04LjVjMC44LDEuNSwyLjEsNCw0LDRz
- My4yLTIuNSw0LTRjMC43LDEsMS43LDEuNSwyLjcsMS45bDAsMCAgIGMtMC41LDAuOS0wLjcsMi0wLjcs
- My4xYzAsMC40LDAsMC43LDAuMSwxLjFMMTYuMiwyNkwxNi4yLDI2eiBNOS4zLDEwLjljMCwwLDAsMC4x
- LDAsMC4yYzAuNiwyLjMsMiw0LjksNC43LDQuOXM0LjItMi42LDQuNy00LjkgICBWMTFjMSwwLjEsMC42
- LTEuMSwwLjktMS42QzE5LjgsOC45LDIwLDguNSwxOS45LDhjLTAuMS0wLjQtMC40LTAuNC0wLjUtMC4z
- QzIxLjIsMi44LDE4LjMsMywxOC4zLDNTMTgsMCwxMi44LDBDOCwwLDcuNCw0LDguNSw3LjYgICBDOC40
- LDcuNiw4LjEsNy43LDgsNy45QzcuOSw4LjQsOC4yLDguOCw4LjQsOS4zQzguNiw5LjgsOC4zLDExLDku
- MywxMC45eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yNywxNmMtMi44LDAtNSwyLjIt
- NSw1YzAsMC42LDAuMSwxLjIsMC4zLDEuN0wxNiwyOXYzaDR2LTJoMnYtMmgybDIuMS0yLjFDMjYuNCwy
- NiwyNi43LDI2LDI3LDI2ICAgYzIuOCwwLDUtMi4yLDUtNVMyOS44LDE2LDI3LDE2eiBNMjcsMjJjLTAu
- NiwwLTEtMC40LTEtMWMwLTAuNiwwLjQtMSwxLTFzMSwwLjQsMSwxQzI4LDIxLjYsMjcuNiwyMiwyNywy
- MnoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
<data name="barCekSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/01-series/AddAssetsExchangerSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/01-series/AddAssetsExchangerSeriesDlg.cs
index 201d762..e2fe446 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/01-series/AddAssetsExchangerSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/01-series/AddAssetsExchangerSeriesDlg.cs
@@ -18,9 +18,12 @@
{
_assetsExchangerSeriesViews = new List<AssetsExchangerSeriesViewModel>();
var allList = await new BLL.AssetsExchangerSeries().GetAll();
- foreach (var item in allList)
+ if (allList != null)
{
- _assetsExchangerSeriesViews.Add(new AssetsExchangerSeriesViewModel(item));
+ foreach (var item in allList)
+ {
+ _assetsExchangerSeriesViews.Add(new AssetsExchangerSeriesViewModel(item));
+ }
}
treeListLookUpEdit1TreeList.DataSource = _assetsExchangerSeriesViews;
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.resx
deleted file mode 100644
index d438392..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.Designer.cs
index 00d88a0..26151f9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class AddAssetsKitSeriesDlg
+ partial class AddAssetsPackageSeriesDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.cs
similarity index 79%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.cs
index 232251f..4693a4d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- public partial class AddAssetsKitSeriesDlg : DevExpress.XtraEditors.XtraForm
+ public partial class AddAssetsPackageSeriesDlg : DevExpress.XtraEditors.XtraForm
{
- public AddAssetsKitSeriesDlg()
+ public AddAssetsPackageSeriesDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
@@ -11,18 +11,18 @@
public event Func<Vmo.AssetsPackageSeriesVmo, object, Task<bool>> ReloadDataEvent = null;
- private List<AssetsKitSeriesViewModel> _assetsEquipmentSeriesViews;
+ private List<AssetsPackageSeriesViewModel> _assetsEquipmentSeriesViews;
//鍒濆鍖�
private async void AddAssetsEquipmentSeriesDlg_Load(object sender, EventArgs e)
{
- _assetsEquipmentSeriesViews = new List<AssetsKitSeriesViewModel>();
- var allList = await new BLL.AssetsKitSeries().GetAll();
+ _assetsEquipmentSeriesViews = new List<AssetsPackageSeriesViewModel>();
+ var allList = await new BLL.AssetsPackageSeries().GetAll();
if (allList != null)
{
foreach (var item in allList)
{
- _assetsEquipmentSeriesViews.Add(new AssetsKitSeriesViewModel(item));
+ _assetsEquipmentSeriesViews.Add(new AssetsPackageSeriesViewModel(item));
}
}
treeListLookUpEdit1TreeList.DataSource = _assetsEquipmentSeriesViews;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AddAssetsPackageSeriesDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AssetsKitSeriesViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AssetsPackageSeriesViewModel.cs
similarity index 81%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AssetsKitSeriesViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AssetsPackageSeriesViewModel.cs
index 8b3292c..58d7abc 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AssetsKitSeriesViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/AssetsPackageSeriesViewModel.cs
@@ -2,13 +2,13 @@
namespace HStation.WinFrmUI.Assets
{
- public class AssetsKitSeriesViewModel
+ public class AssetsPackageSeriesViewModel
{
- public AssetsKitSeriesViewModel()
+ public AssetsPackageSeriesViewModel()
{
}
- public AssetsKitSeriesViewModel(Vmo.AssetsPackageSeriesVmo rhs)
+ public AssetsPackageSeriesViewModel(Vmo.AssetsPackageSeriesVmo rhs)
{
this.Name = rhs.Name;
this.ID = rhs.ID;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.Designer.cs
index 0cacca5..af338f7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class EditAssetsKitSeriesDlg
+ partial class EditAssetsPackageSeriesDlg
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.cs
similarity index 82%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.cs
index baf2fd8..000473a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/EditAssetsKitSeriesDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.cs
@@ -1,8 +1,8 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- public partial class EditAssetsKitSeriesDlg : DevExpress.XtraEditors.XtraForm
+ public partial class EditAssetsPackageSeriesDlg : DevExpress.XtraEditors.XtraForm
{
- public EditAssetsKitSeriesDlg()
+ public EditAssetsPackageSeriesDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
@@ -11,19 +11,19 @@
public event Func<Vmo.AssetsPackageSeriesVmo, object, Task<bool>> ReloadDataEvent = null;
private Vmo.AssetsPackageSeriesVmo _assetsEquipmentSeries = null;
- private List<AssetsKitSeriesViewModel> _assetsEquipmentSeriesViews;
+ private List<AssetsPackageSeriesViewModel> _assetsEquipmentSeriesViews;
public async void SetBindingData(Vmo.AssetsPackageSeriesVmo seriesVmo)
{
- _assetsEquipmentSeriesViews = new List<AssetsKitSeriesViewModel>();
+ _assetsEquipmentSeriesViews = new List<AssetsPackageSeriesViewModel>();
_assetsEquipmentSeries = seriesVmo;
this.NameTextEdit.Text = _assetsEquipmentSeries.Name;
this.DescriptionTextEdit.Text = _assetsEquipmentSeries.Description;
this.TagNameTextEdit.Text = _assetsEquipmentSeries.TagName;
- var allList = await new BLL.AssetsKitSeries().GetAll();
+ var allList = await new BLL.AssetsPackageSeries().GetAll();
foreach (var item in allList)
{
- _assetsEquipmentSeriesViews.Add(new AssetsKitSeriesViewModel(item));
+ _assetsEquipmentSeriesViews.Add(new AssetsPackageSeriesViewModel(item));
}
treeListLookUpEdit1TreeList.DataSource = _assetsEquipmentSeriesViews;
if (_assetsEquipmentSeries.ParentIds.Count > 0)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.resx
similarity index 100%
copy from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/AddAssetsKitSeriesDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/EditAssetsPackageSeriesDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.cs
similarity index 83%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.cs
index e2a9f17..4a5b9f7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.cs
@@ -7,9 +7,9 @@
/// <summary>
///
/// </summary>
- public partial class KitTreeListCtrl : XtraUserControl
+ public partial class PackageTreeListCtrl : XtraUserControl
{
- public KitTreeListCtrl()
+ public PackageTreeListCtrl()
{
InitializeComponent();
this.treeList1.InitialDefaultSettings();
@@ -19,19 +19,19 @@
//鑱氱劍鏀瑰彉浜嬩欢
public event Action<long> ReloadEvent = null;
- private BLL.AssetsKitSeries _bll = null;
+ private BLL.AssetsPackageSeries _bll = null;
- private List<AssetsKitSeriesViewModel> _allBindingList = new List<AssetsKitSeriesViewModel>();
+ private List<AssetsPackageSeriesViewModel> _allBindingList = new List<AssetsPackageSeriesViewModel>();
public async void SetBindingData()
{
- _bll = new BLL.AssetsKitSeries();
+ _bll = new BLL.AssetsPackageSeries();
var alllist = await _bll.GetAll();
if (alllist != null)
{
foreach (var item in alllist)
{
- _allBindingList.Add(new AssetsKitSeriesViewModel(item));
+ _allBindingList.Add(new AssetsPackageSeriesViewModel(item));
}
}
this.treeList1.DataSource = _allBindingList;
@@ -39,7 +39,7 @@
}
//鑾峰彇绯诲垪ID
- public AssetsKitSeriesViewModel GetCurrentSeries()
+ public AssetsPackageSeriesViewModel GetCurrentSeries()
{
var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (vm == null)
@@ -50,7 +50,7 @@
//娣诲姞闃�闂ㄧ郴鍒�
private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddAssetsKitSeriesDlg();
+ var dlg = new AddAssetsPackageSeriesDlg();
dlg.ReloadDataEvent += async (rhs, currentId) =>
{
if (currentId != null)
@@ -58,12 +58,12 @@
var select = await _bll.GetByID(Convert.ToInt64(currentId));
rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
}
- var bll = new BLL.AssetsKitSeries();
+ var bll = new BLL.AssetsPackageSeries();
var id = await bll.Insert(rhs);
if (id > 0)
{
rhs.ID = id;
- _allBindingList.Add(new AssetsKitSeriesViewModel(rhs));
+ _allBindingList.Add(new AssetsPackageSeriesViewModel(rhs));
this.treeList1.RefreshDataSource();
return true;
}
@@ -93,8 +93,8 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
return;
}
- var dlg = new EditAssetsKitSeriesDlg();
- var AssetsEquipmentSeries = await BLLFactory<BLL.AssetsKitSeries>.Instance.GetByID(vm.ID);
+ var dlg = new EditAssetsPackageSeriesDlg();
+ var AssetsEquipmentSeries = await BLLFactory<BLL.AssetsPackageSeries>.Instance.GetByID(vm.ID);
if (AssetsEquipmentSeries == null)
return;
dlg.SetBindingData(AssetsEquipmentSeries);
@@ -105,7 +105,7 @@
var select = await _bll.GetByID(Convert.ToInt64(currentId));
rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
}
- if (await BLLFactory<BLL.AssetsKitSeries>.Instance.Update(rhs))
+ if (await BLLFactory<BLL.AssetsPackageSeries>.Instance.Update(rhs))
{
vm.Reset(rhs);
this.treeList1.RefreshDataSource();
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.designer.cs
index d736b6b..c3a78c0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class KitTreeListCtrl
+ partial class PackageTreeListCtrl
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/01-series/KitTreeListCtrl.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/01-series/PackageTreeListCtrl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/EquipmentProductListBox.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/EquipmentProductListBox.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/PropGroupChoiceViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/PropGroupChoiceViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/01-EditPumpPartProp/PropGroupChoiceViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/01-EditPumpPartProp/PropGroupChoiceViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.Designer.cs
index 78a80f2..1bd19a1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class AddAssetsKitMainDlg
+ partial class AddAssetsPackageMainDlg
{
/// <summary>
/// Required designer variable.
@@ -30,7 +30,7 @@
{
components = new System.ComponentModel.Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddAssetsKitMainDlg));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddAssetsPackageMainDlg));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -473,7 +473,7 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // AddAssetsKitMainDlg
+ // AddAssetsPackageMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.cs
similarity index 96%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.cs
index 9dc7072..0781b25 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.cs
@@ -3,9 +3,9 @@
namespace HStation.WinFrmUI.Assets
{
- public partial class AddAssetsKitMainDlg : DevExpress.XtraEditors.XtraForm
+ public partial class AddAssetsPackageMainDlg : DevExpress.XtraEditors.XtraForm
{
- public AddAssetsKitMainDlg()
+ public AddAssetsPackageMainDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/AddAssetsKitMainDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/AddAssetsPackageMainDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.Designer.cs
index 4e65a28..c324994 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class EditAssetsKitMainDlg
+ partial class EditAssetsPackageMainDlg
{
/// <summary>
/// Required designer variable.
@@ -30,7 +30,7 @@
{
components = new System.ComponentModel.Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditAssetsKitMainDlg));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditAssetsPackageMainDlg));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -473,7 +473,7 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
- // EditAssetsKitMainDlg
+ // EditAssetsPackageMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
index 06b295a..87e301e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
@@ -3,9 +3,9 @@
namespace HStation.WinFrmUI.Assets
{
- public partial class EditAssetsKitMainDlg : DevExpress.XtraEditors.XtraForm
+ public partial class EditAssetsPackageMainDlg : DevExpress.XtraEditors.XtraForm
{
- public EditAssetsKitMainDlg()
+ public EditAssetsPackageMainDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
@@ -22,7 +22,7 @@
_EquipmentVmo = KitMainVmo;
var pumpAllList = await new BLL.AssetsPumpMain().GetAll();
this.repositoryItemTreeListLookUpEdit1.DataSource = pumpAllList;
- var pumpList = await new BLL.AssetsKitPumpMapping().GetByKitID(_EquipmentVmo.ID);
+ var pumpList = await new BLL.AssetsPackagePumpMapping().GetByKitID(_EquipmentVmo.ID);
_allBindingList = new List<PumpAccountViewModel>();
if (pumpList != null)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/EditAssetsKitMainDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/KitViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/KitViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
index a69800e..379ae83 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/KitViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
@@ -2,13 +2,13 @@
namespace HStation.WinFrmUI.Assets
{
- public class KitViewModel
+ public class PackageViewModel
{
- public KitViewModel()
+ public PackageViewModel()
{
}
- public KitViewModel(Vmo.AssetsPackageMainVmo rhs)
+ public PackageViewModel(Vmo.AssetsPackageMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/PumpAccountViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PumpAccountViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/02-main/PumpAccountViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PumpAccountViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/03-equipment/EquipmentViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.Designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.Designer.cs
index 32d75c8..0b697cf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Assets
{
- partial class KitManageMainPage
+ partial class PackageManageMainPage
{
/// <summary>
/// Required designer variable.
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KitManageMainPage));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageManageMainPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -64,7 +64,7 @@
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- EquipmentTreeListCtrl1 = new KitTreeListCtrl();
+ EquipmentTreeListCtrl1 = new PackageTreeListCtrl();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
@@ -279,7 +279,7 @@
//
// kitViewModelBindingSource
//
- kitViewModelBindingSource.DataSource = typeof(KitViewModel);
+ kitViewModelBindingSource.DataSource = typeof(PackageViewModel);
//
// gridView1
//
@@ -370,7 +370,7 @@
EquipmentTreeListCtrl1.Size = new Size(193, 491);
EquipmentTreeListCtrl1.TabIndex = 0;
//
- // KitManageMainPage
+ // PackageManageMainPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
@@ -412,7 +412,7 @@
private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
- private KitTreeListCtrl EquipmentTreeListCtrl1;
+ private PackageTreeListCtrl EquipmentTreeListCtrl1;
private DevExpress.XtraBars.BarButtonItem BarBtnEidtProp;
private DevExpress.XtraGrid.GridControl gridControl2;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.cs
similarity index 90%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.cs
index 0abb0e6..61741f0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.cs
@@ -2,9 +2,9 @@
namespace HStation.WinFrmUI.Assets
{
- public partial class KitManageMainPage : DocumentPage
+ public partial class PackageManageMainPage : DocumentPage
{
- public KitManageMainPage()
+ public PackageManageMainPage()
{
InitializeComponent();
this.PageTitle.Caption = "鎴愬璁惧";
@@ -19,17 +19,17 @@
this.EquipmentTreeListCtrl1.ReloadEvent += EquipmentTreeListCtrl1_ReloadEvent;
}
- private BLL.AssetsKitMain _bll = null;
+ private BLL.AssetsPackageMain _bll = null;
- private List<KitViewModel> _allBindingList = new List<KitViewModel>();
+ private List<PackageViewModel> _allBindingList = new List<PackageViewModel>();
private List<EquipmentViewModel> _allEquipmentList = new();
- private BLL.AssetsKitPumpMapping _mappingBll = new();
+ private BLL.AssetsPackagePumpMapping _mappingBll = new();
//鍒濆鍖栨暟鎹�
public override void InitialDataSource()
{
- _bll = new BLL.AssetsKitMain();
+ _bll = new BLL.AssetsPackageMain();
this.EquipmentTreeListCtrl1.SetBindingData();
this.kitViewModelBindingSource.DataSource = _allBindingList;
this.kitViewModelBindingSource.ResetBindings(false);
@@ -44,7 +44,7 @@
{
foreach (var item in alllist)
{
- _allBindingList.Add(new KitViewModel(item));
+ _allBindingList.Add(new PackageViewModel(item));
}
}
this.kitViewModelBindingSource.ResetBindings(false);
@@ -53,7 +53,7 @@
//娣诲姞
private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddAssetsKitMainDlg();
+ var dlg = new AddAssetsPackageMainDlg();
var series = this.EquipmentTreeListCtrl1.GetCurrentSeries();
if (series == null)
{
@@ -67,7 +67,7 @@
if (id > 0)
{
rhs.ID = id;
- _allBindingList.Add(new KitViewModel(await _bll.GetByID(id)));
+ _allBindingList.Add(new PackageViewModel(await _bll.GetByID(id)));
this.kitViewModelBindingSource.ResetBindings(false);
foreach (var item in allMappingList)
{
@@ -95,7 +95,7 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
return;
}
- var dlg = new EditAssetsKitMainDlg();
+ var dlg = new EditAssetsPackageMainDlg();
var Equipment = await _bll.GetByID(vm.ID);
if (Equipment == null)
return;
@@ -165,7 +165,7 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛岋紒");
return;
}
- var allList = await new BLL.AssetsKitPumpMapping().GetByKitID(currentVm.ID);
+ var allList = await new BLL.AssetsPackagePumpMapping().GetByKitID(currentVm.ID);
if (allList != null)
{
foreach (var item in allList)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/12-kit/KitManageMainPage.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/KitManageMainPage.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index fdedb51..6eb039b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -23,15 +23,15 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
- <Compile Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
- <Compile Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
- <Compile Remove="12-kit\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
+ <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
+ <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
+ <Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
- <EmbeddedResource Remove="12-kit\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
+ <EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
</ItemGroup>
<ItemGroup>
@@ -158,22 +158,22 @@
<Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-kit\01-series\AddAssetsKitSeriesDlg.cs">
+ <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-kit\01-series\KitTreeListCtrl.cs">
+ <Compile Update="12-package\01-series\PackageTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="12-kit\01-series\EditAssetsKitSeriesDlg.cs">
+ <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-kit\02-main\EditAssetsKitMainDlg.cs">
+ <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-kit\02-main\AddAssetsKitMainDlg.cs">
+ <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-kit\KitManageMainPage.cs">
+ <Compile Update="12-package\KitManageMainPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
@@ -191,7 +191,7 @@
</ItemGroup>
<ItemGroup>
- <Folder Include="12-kit\02-main\01-EditPumpPartProp\" />
+ <Folder Include="12-package\02-main\01-EditPumpPartProp\" />
</ItemGroup>
</Project>
--
Gitblit v1.9.3