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

lixiaojun

2024-11-18 a302d7d16e6bed80511cb49813d16829eb933560

 Service/HStation.Service.Assets.Core/04-dal/02-postgresql/01-PumpMain/PumpMain.cs

@@ -36,7 +36,7 @@
                    }
                    else
                    {
                        var map = db.Queryable<Entity.AssetsPumpGroupAndMainMap>().ToList().Find(x => x.PumpMainID == ID);
                        var map = db.Queryable<Entity.AssetsPumpGroupAndMainMapping>().ToList().Find(x => x.MainID == ID);
                        if (map != null)
                        {
                            var mapresult = db.Deleteable(map).ExecuteCommand() > 0;
@@ -59,7 +59,7 @@
        }

        //插入拓展
        public long InsertsEx(Entity.AssetsPumpMain AssetsPumpMain, Entity.AssetsPumpGroupAndMainMap AssetsPumpGroupAndMainMap)
        public long InsertsEx(Entity.AssetsPumpMain AssetsPumpMain, Entity.AssetsPumpGroupAndMainMapping AssetsPumpGroupAndMainMap)
        {
            if (AssetsPumpMain == null)
            {
@@ -80,7 +80,7 @@
                    {
                        if (AssetsPumpGroupAndMainMap != null)
                        {
                            AssetsPumpGroupAndMainMap.PumpMainID = result;
                            AssetsPumpGroupAndMainMap.MainID = result;
                            var mapresult = db.Insertable(AssetsPumpGroupAndMainMap).ExecuteReturnSnowflakeId();
                            if (mapresult < 0)
                            {