修复单位制删除bug

lixiaojun

2024-06-02 1485ae366d837f9df65405636123ba56a638b731

修复单位制删除bug

 Yw.Application.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-05-31T06:22:59.9089412Z;True|2024-05-21T14:19:57.0327597+08:00;True|2024-05-13T09:32:47.5202940+08:00;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;True|2024-03-24T16:04:31.1520708+08:00;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <History>True|2024-06-02T10:16:08.6703355Z;True|2024-05-31T14:22:59.9089412+08:00;True|2024-05-21T14:19:57.0327597+08:00;True|2024-05-13T09:32:47.5202940+08:00;True|2024-05-08T15:06:02.4935916+08:00;True|2024-04-11T11:48:27.6911791+08:00;True|2024-04-03T09:21:17.2938358+08:00;True|2024-03-30T14:43:35.7624433+08:00;True|2024-03-24T16:04:31.1520708+08:00;True|2024-03-20T13:28:31.4429012+08:00;True|2024-03-08T16:08:21.6186021+08:00;True|2024-01-27T09:16:19.1123592+08:00;True|2024-01-21T14:04:53.3821335+08:00;True|2024-01-20T18:00:33.8425629+08:00;True|2024-01-20T17:58:31.8270324+08:00;True|2024-01-20T12:19:49.4239246+08:00;True|2024-01-14T13:50:48.6498781+08:00;True|2023-12-02T14:29:46.1910954+08:00;True|2023-11-15T09:23:23.1277615+08:00;True|2023-11-13T11:14:23.7047654+08:00;True|2023-11-07T15:28:54.3174797+08:00;True|2023-10-27T13:22:55.8696581+08:00;True|2023-10-21T18:17:31.4681547+08:00;True|2023-10-18T17:29:57.6963038+08:00;True|2023-09-15T12:09:34.4888678+08:00;True|2023-09-14T15:15:33.6113596+08:00;True|2023-08-21T13:09:54.7440181+08:00;True|2023-07-25T15:08:42.3375388+08:00;True|2023-07-17T10:31:53.5181752+08:00;True|2023-07-17T10:31:44.6652344+08:00;True|2023-07-13T12:10:11.2591498+08:00;True|2023-05-25T18:02:16.3580168+08:00;True|2023-05-25T15:44:32.4909866+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Application.Unit.Core/Yw.Application.Unit.Core.csproj

@@ -7,7 +7,7 @@
    <RootNamespace>Yw.Application</RootNamespace>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
    <Version>3.0.8</Version>
    <Version>3.0.9</Version>
    <Description>引用升级</Description>
  </PropertyGroup>

@@ -34,7 +34,7 @@

  <ItemGroup>
    <PackageReference Include="Yw.Application.Core" Version="3.0.7" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.8" />
    <PackageReference Include="Yw.Dto.Unit.Core" Version="3.0.9" />
  </ItemGroup>

</Project>

 Yw.Dto.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-05-31T06:22:14.7558274Z;True|2024-05-21T14:13:16.7771524+08:00;True|2024-05-13T09:32:01.1736078+08:00;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <History>True|2024-06-02T10:15:21.5081941Z;True|2024-05-31T14:22:14.7558274+08:00;True|2024-05-21T14:13:16.7771524+08:00;True|2024-05-13T09:32:01.1736078+08:00;True|2024-05-08T15:05:05.7504044+08:00;True|2024-05-08T15:04:50.5790715+08:00;True|2024-04-11T11:47:05.2985116+08:00;True|2024-04-03T09:20:17.1118683+08:00;True|2024-04-03T09:20:14.2889343+08:00;True|2024-03-30T14:42:12.5290823+08:00;True|2024-03-24T15:58:01.8436381+08:00;True|2024-03-20T13:14:26.0945194+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Dto.Unit.Core/Yw.Dto.Unit.Core.csproj

@@ -4,13 +4,13 @@
    <TargetFramework>net6.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <Version>3.0.8</Version>
    <Version>3.0.9</Version>
    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Dto.Core" Version="3.0.7" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.6" />
    <PackageReference Include="Yw.Service.Unit.Core" Version="3.0.7" />
  </ItemGroup>

</Project>

 Yw.Service.Unit.Core/04-dal/01-interface/05-transfer/ISysUnitTransfer.cs

@@ -12,6 +12,11 @@
        List<Entity.SysUnitTransfer> GetByTypeID(long TypeID);

        /// <summary>
        /// 通过 ValueID 获取
        /// </summary>
        List<Entity.SysUnitTransfer> GetByValueID(long ValueID);

        /// <summary>
        /// 设置
        /// </summary>
        bool SetByTypeID(long TypeID, List<Entity.SysUnitTransferTypeSetter> list);

 Yw.Service.Unit.Core/04-dal/02-postgresql/03-value/SysUnitValue.cs

@@ -28,8 +28,35 @@
            }
        }



        /// <summary>
        /// 通过 ID 删除（重写是为了清除关联的单位名称和单位转换）
        /// </summary>
        public override bool DeleteByID(long ID)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    db.BeginTran();
                    var bol = db.Deleteable<Entity.SysUnitValue>().Where(x => x.ID == ID)
                        .ExecuteCommandHasChange();
                    if (!bol)
                    {
                        db.RollbackTran();
                        return false;
                    }
                    db.Deleteable<Entity.SysUnitName>().Where(x => x.ValueID == ID).ExecuteCommandHasChange();
                    db.Deleteable<Entity.SysUnitTransfer>().Where(x => x.FromValueID == ID || x.ToValueID == ID).ExecuteCommandHasChange();
                    db.CommitTran();
                    return true;
                }
                catch
                {
                    db.RollbackTran();
                    throw;
                }
            }
        }




 Yw.Service.Unit.Core/04-dal/02-postgresql/05-transfer/SysUnitTransfer.cs

@@ -27,6 +27,18 @@
        }

        /// <summary>
        /// 通过 ValueID 获取
        /// </summary>
        public List<Entity.SysUnitTransfer> GetByValueID(long ValueID)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Queryable<Entity.SysUnitTransfer>()
                    .Where(x => x.FromValueID == ValueID || x.ToValueID == ValueID).ToList();
            }
        }

        /// <summary>
        /// 设置
        /// </summary>
        public bool SetByTypeID(long TypeID, List<Entity.SysUnitTransferTypeSetter> list)

 Yw.Service.Unit.Core/04-dal/03-sqlite/03-value/SysUnitValue.cs

@@ -28,6 +28,35 @@
            }
        }

        /// <summary>
        /// 通过 ID 删除（重写是为了清除关联的单位名称和单位转换）
        /// </summary>
        public override bool DeleteByID(long ID)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                try
                {
                    db.BeginTran();
                    var bol = db.Deleteable<Entity.SysUnitValue>().Where(x => x.ID == ID)
                        .ExecuteCommandHasChange();
                    if (!bol)
                    {
                        db.RollbackTran();
                        return false;
                    }
                    db.Deleteable<Entity.SysUnitName>().Where(x => x.ValueID == ID).ExecuteCommandHasChange();
                    db.Deleteable<Entity.SysUnitTransfer>().Where(x => x.FromValueID == ID || x.ToValueID == ID).ExecuteCommandHasChange();
                    db.CommitTran();
                    return true;
                }
                catch
                {
                    db.RollbackTran();
                    throw;
                }
            }
        }




 Yw.Service.Unit.Core/04-dal/03-sqlite/05-transfer/SysUnitTransfer.cs

@@ -27,6 +27,18 @@
        }

        /// <summary>
        /// 通过 ValueID 获取
        /// </summary>
        public List<Entity.SysUnitTransfer> GetByValueID(long ValueID)
        {
            using (var db = new SqlSugarClient(ConnectionConfig))
            {
                return db.Queryable<Entity.SysUnitTransfer>()
                    .Where(x => x.FromValueID == ValueID || x.ToValueID == ValueID).ToList();
            }
        }

        /// <summary>
        /// 设置
        /// </summary>
        public bool SetByTypeID(long TypeID, List<Entity.SysUnitTransferTypeSetter> list)

 Yw.Service.Unit.Core/05-service/03-value/SysUnitValue.cs

@@ -404,21 +404,13 @@
        public bool DeleteByID(long ID, out string Msg)
        {
            Msg = string.Empty;
            if (new SysUnitName().IsExistByValueID(ID))
            {
                Msg = "已配置单位名称";
                return false;
            }
            if (new SysUnitTransfer().IsExistByValueID(ID))
            {
                Msg = "已配置单位转换";
                return false;
            }
            var dal = DALCreateHelper.CreateDAL<Yw.DAL.ISysUnitValue>();
            var bol = dal.DeleteByID(ID);
            if (bol)
            {
                RemoveCache(ID);
                SysUnitName.RemoveCacheByValueID(ID);
                SysUnitTransfer.RemoveCacheByValueID(ID);
            }
            return bol;
        }

 Yw.Service.Unit.Core/05-service/04-name/SysUnitName.cs

@@ -85,6 +85,14 @@
            SysUnitNameCacheHelper.Trigger();
        }

        //通过 ValueID 移除缓存
        internal static void RemoveCacheByValueID(long ValueID)
        {
            var all = GetCache();
            all.RemoveAll(x => x.ValueID == ValueID);
            SysUnitNameCacheHelper.Trigger();
        }

        /// <summary>
        /// 发布缓存
        /// </summary>

 Yw.Service.Unit.Core/05-service/05-transfer/SysUnitTransfer.cs

@@ -84,6 +84,14 @@
            all.RemoveAll(x => x.ID == ID);
        }

        //通过 ValueID 移除缓存
        internal static void RemoveCacheByValueID(long ValueID)
        {
            var all = GetCache();
            all.RemoveAll(x => x.FromValueID == ValueID || x.ToValueID == ValueID);
            SysUnitTransferCacheHelper.Trigger();
        }

        /// <summary>
        /// 发布缓存
        /// </summary>

 Yw.Service.Unit.Core/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project>
  <PropertyGroup>
    <History>True|2024-05-31T06:21:25.9548888Z;True|2024-05-21T14:10:07.7011142+08:00;True|2024-04-11T11:46:08.7351336+08:00;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;True|2024-03-24T15:57:00.6285019+08:00;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <History>True|2024-06-02T10:14:27.1302271Z;True|2024-05-31T14:21:25.9548888+08:00;True|2024-05-21T14:10:07.7011142+08:00;True|2024-04-11T11:46:08.7351336+08:00;True|2024-04-03T09:19:28.3206735+08:00;True|2024-03-30T14:40:53.5629250+08:00;True|2024-03-24T15:57:00.6285019+08:00;True|2024-03-20T20:29:28.4545096+08:00;True|2024-03-20T11:57:05.1553144+08:00;True|2024-03-08T16:07:15.2641115+08:00;True|2024-01-21T14:04:10.1964644+08:00;True|2024-01-20T17:53:52.5924005+08:00;True|2024-01-20T12:18:53.6738460+08:00;True|2024-01-14T13:38:56.7132086+08:00;True|2023-12-02T14:19:36.0851107+08:00;True|2023-11-13T11:13:38.2876503+08:00;True|2023-11-07T15:26:15.8664916+08:00;True|2023-10-27T13:21:57.8245827+08:00;True|2023-10-21T18:15:57.8975745+08:00;True|2023-10-18T17:28:42.7347523+08:00;True|2023-09-15T12:08:33.6892307+08:00;True|2023-09-14T15:13:47.6095636+08:00;True|2023-08-21T13:08:28.2298969+08:00;True|2023-07-17T10:30:15.0370305+08:00;True|2023-07-13T11:54:33.7989040+08:00;True|2023-07-13T11:54:23.3967174+08:00;True|2023-07-06T09:49:52.7407983+08:00;True|2023-05-25T15:37:23.5406830+08:00;False|2023-05-25T15:36:09.3589239+08:00;</History>
    <LastFailureDetails />
  </PropertyGroup>
</Project>

 Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj

@@ -7,7 +7,7 @@
        <RootNamespace>Yw</RootNamespace>
        <GenerateDocumentationFile>True</GenerateDocumentationFile>
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
        <Version>3.0.6</Version>
        <Version>3.0.7</Version>
        <Description>引用升级</Description>
    </PropertyGroup>