Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-10-12 f2333318a31e92f6cbc3a572d8eb9fae9da0f892

 Service/HStation.Service.Assets.Core/04-dal/03-sqlite/01-PumpMainManage/PumpPart.cs

@@ -5,7 +5,7 @@
    /// <summary>
    ///
    /// </summary>
    public partial class PumpPartMain : BaseDAL_Sorter<Entity.PumpPartMain>, IPumpPartMain
    public partial class AssetsPumpPartMain : BaseDAL_Sorter<Entity.AssetsPumpPartMain>, IAssetsPumpPartMain
    {
        /// <summary>
        ///
@@ -16,7 +16,7 @@
        }

        //插入拓展
        public long InsertsEx(Entity.PumpPartMain part, List<Entity.PumpPropContent> pumpPropContents, Entity.PumpMainAndPartMap partmap)
        public long InsertsEx(Entity.AssetsPumpPartMain part, List<Entity.AssetsPumpPropContent> AssetsPumpPropContents, Entity.AssetsPumpMainAndPartMap partmap)
        {
            if (part == null)
            {
@@ -46,13 +46,9 @@
                            }
                            else
                            {
                                if (pumpPropContents != null)
                                if (AssetsPumpPropContents != null)
                                {
                                    foreach (var item in pumpPropContents)
                                    {
                                        item.PartID = result;
                                    }
                                    var content = db.Insertable(pumpPropContents).ExecuteReturnSnowflakeId();
                                    var content = db.Insertable(AssetsPumpPropContents).ExecuteReturnSnowflakeId();
                                    if (content < 0)
                                    {
                                        db.RollbackTran();
@@ -75,7 +71,7 @@
        }

        //编辑拓展
        public bool UpdateEx(Entity.PumpPartMain part, List<Entity.PumpPropContent> pumpPropContents)
        public bool UpdateEx(Entity.AssetsPumpPartMain part, List<Entity.AssetsPumpPropContent> AssetsPumpPropContents)
        {
            if (part == null)
            {
@@ -94,9 +90,9 @@
                    }
                    else
                    {
                        if (pumpPropContents != null)
                        if (AssetsPumpPropContents != null)
                        {
                            var propresult = db.Updateable(pumpPropContents).ExecuteCommandHasChange();
                            var propresult = db.Updateable(AssetsPumpPropContents).ExecuteCommandHasChange();
                            if (!propresult)
                            {
                                db.RollbackTran();
@@ -116,7 +112,7 @@
        }

        //删除拓展 (删除产品表及属性表)
        public bool DeleteEx(Entity.PumpPartMain part, List<Entity.PumpPropContent> pumpPropContents)
        public bool DeleteEx(Entity.AssetsPumpPartMain part, List<Entity.AssetsPumpPropContent> AssetsPumpPropContents)
        {
            if (part == null)
            {
@@ -135,9 +131,9 @@
                    }
                    else
                    {
                        if (pumpPropContents != null)
                        if (AssetsPumpPropContents != null)
                        {
                            var propresult = db.Deleteable(pumpPropContents).ExecuteCommand() > 0;
                            var propresult = db.Deleteable(AssetsPumpPropContents).ExecuteCommand() > 0;
                            if (!propresult)
                            {
                                db.RollbackTran();