From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/05-PumpPartMain/PumpPartMain.cs | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/05-PumpPartMain/PumpPartMain.cs b/Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/05-PumpPartMain/PumpPartMain.cs
index eb9e468..ff5ef75 100644
--- a/Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/05-PumpPartMain/PumpPartMain.cs
+++ b/Service/HStation.Service.Assets.Core/05-service/01-PumpMainManage/05-PumpPartMain/PumpPartMain.cs
@@ -195,7 +195,7 @@
if (id > 0)
{
UpdateCache(id);
- // AssetsPumpPropContent.UpdateCacheByPartID(id);
+ AssetsPumpPropContent.UpdateCacheByPartID(id);
AssetsPumpMainAndPartMap.UpdateCacheByPartID(id);
}
return id;
@@ -327,22 +327,21 @@
return bol;
}
- /* //閫氳繃 ID 鍒犻櫎浜у搧琛ㄥ強灞炴�ц〃
- public bool DeleteExByID(long ID)
- {
- var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
- var partmain = dal.GetByID(ID);
- var propmodellist = AssetsPumpPropContent.GetProplistByPartID(ID);
- var propentitylist = AssetsPumpPropContent.Model2Entities(propmodellist);
- var bol = dal.DeleteEx(partmain, propentitylist);
- if (bol)
- {
- RemoveCache(ID);
- AssetsPumpPropContent.RemoveCacheByIDs(propmodellist.Select(x => x.ID).ToList());
- }
- return bol;
- }
- */
+ //閫氳繃 ID 鍒犻櫎浜у搧琛ㄥ強灞炴�ц〃
+ public bool DeleteExByID(long ID)
+ {
+ var dal = DALCreateHelper.CreateDAL<HStation.DAL.IAssetsPumpPartMain>();
+ var partmain = dal.GetByID(ID);
+ var propmodellist = AssetsPumpPropContent.GetProplistByPartID(ID);
+ var propentitylist = AssetsPumpPropContent.Model2Entities(propmodellist);
+ var bol = dal.DeleteEx(partmain, propentitylist);
+ if (bol)
+ {
+ RemoveCache(ID);
+ AssetsPumpPropContent.RemoveCacheByIDs(propmodellist.Select(x => x.ID).ToList());
+ }
+ return bol;
+ }
#endregion Delete
}
--
Gitblit v1.9.3