优化审核逻辑和数据处理

- 修改 `Pm_GoodsStorage.cs` 中 `StatusDesc` 属性，去掉财务部审核信息。
- 在 `GoodsInfoView.cs` 中新增 `GoodsType` 属性。
- 更新 `DailyFeePaymentRepository.cs` 的注释，添加费用审核说明并注释部分代码。
- 新增 `GoodsAuditType` 方法于 `GoodsRepository.cs`，判断物品类型是否需要多部门审核。
- 修改数据查询逻辑，确保获取物品信息时的有效性检查。
- 优化审核人员处理逻辑，使用列表存储审核人员信息。
- 增加入库状态描述构建逻辑，确保审核过程中的状态记录。
- 调整审核状态判断逻辑，确保多级审核情况下的正确更新。
- 修复 `GoodsStorageConfirmAuditDep` 方法参数格式，符合代码规范。
- 更新财务审核人员 ID 列表，确保准确性。

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_GoodsStorage.cs

@@ -96,7 +96,8 @@ namespace OASystem.Domain.Entities.PersonnelModule
         /// 入库确认描述
         /// </summary>
         [SugarColumn(ColumnDescription = "入库确认描述", IsNullable = true, ColumnDataType = "varchar(100)")]
-        public string StatusDesc { get; set; } = string.Format("人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
+        public string StatusDesc { get; set; } = string.Format("人事部：状态:待确认  审核人:-  审核时间:-;");
+            //string.Format("人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
 
     }
 }

OASystem/OASystem.Domain/ViewModels/PersonnelModule/GoodsInfoView.cs

@@ -264,6 +264,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
     {
         public int Id { get; set; }
         public int GoodsId { get; set; }
+        public int GoodsType { get; set; }
         public string GoodsName { get; set; }
         public string BatchNo { get; set; }
         public decimal Quantity { get; set; }

OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -383,17 +383,19 @@ namespace OASystem.Infrastructure.Repositories.Financial
             /*
              * 2024-10-29
              * 各部门基础固定费用明细”里的费用数据新增后，财务和总经理审核都默认直接通过isAudit=1），并且可编辑，如果ispay=1的话将不可编辑
-             *  2025-02-24
+             * 2025-02-24
              * 团组费用 默认总经理审核通过
+             * 2025-03-25
+             * 各部门基础固定费用明细”里的费用数据新增后，默认老张通过 财务手动审核 
              */
             var priceTypeInfo = await _sqlSugar.Queryable<Sys_SetData>().FirstAsync(x => x.IsDel == 0 && x.Id == dto.PriceTypeId);
             if (priceTypeInfo != null && (priceTypeInfo.STid == 90 || priceTypeInfo.STid == 104))
             {
-                if (priceTypeInfo.STid == 90)
-                {
-                    _fee.FAudit = 1;
-                    _fee.FAuditDate = DateTime.Now;
-                }
+                //if (priceTypeInfo.STid == 90)
+                //{
+                //    _fee.FAudit = 1;
+                //    _fee.FAuditDate = DateTime.Now;
+                //}
 
                 _fee.MAudit = 1;
                 _fee.MAuditDate = DateTime.Now;
@@ -468,29 +470,49 @@ namespace OASystem.Infrastructure.Repositories.Financial
             try
             {
                 Fin_DailyFeePayment _fee = _mapper.Map<Fin_DailyFeePayment>(dto);
+
+                /*
+                 * 
+                 * 2025-02-24
+                 * 更改后的费用类型为 团组费用 默认总经理审核通过
+                 * 2025-03-25
+                 * 更改后的费用类型为 各部门基础固定费用明细”里的费用数据新增后，默认老张通过 财务手动审核
+                 * 
+                 */
+                var priceTypeInfo = await _sqlSugar.Queryable<Sys_SetData>().FirstAsync(x => x.IsDel == 0 && x.Id == dto.PriceTypeId);
+                var auditStatus = false;
+                if (priceTypeInfo != null && (priceTypeInfo.STid == 90 || priceTypeInfo.STid == 104))
+                {
+                    auditStatus = true;
+                }
+
                 _fee.CreateUserId = dto.UserId;
                 int? editFeeStatus = await _sqlSugar.Updateable<Fin_DailyFeePayment>()
-                                      .Where(a => a.Id == dto.Id)
-                                      .SetColumns(a => new Fin_DailyFeePayment
-                                      {
-                                          Instructions = dto.Instructions,
-                                          SumPrice = dto.SumPrice,
-                                          TransferTypeId = dto.TransferTypeId,
-                                          PriceTypeId = dto.PriceTypeId,
-                                          CompanyId = dto.CompanyId,
-                                          GroupId = dto.GroupId,
-                                      }).ExecuteCommandAsync();
+                    .SetColumns(a => new Fin_DailyFeePayment
+                    {
+                        Instructions = dto.Instructions,
+                        SumPrice = dto.SumPrice,
+                        TransferTypeId = dto.TransferTypeId,
+                        PriceTypeId = dto.PriceTypeId,
+                        CompanyId = dto.CompanyId,
+                        GroupId = dto.GroupId,
+                    })
+                    .SetColumnsIF(auditStatus, a => a.MAudit == 1)
+                    .SetColumnsIF(auditStatus, a => a.MAuditDate == DateTime.Now)
+                    .Where(a => a.Id == dto.Id)
+                    .ExecuteCommandAsync();
 
                 var _feeContents = _mapper.Map<List<Fin_DailyFeePaymentContent>>(dto.FeeContents);
 
                 await _sqlSugar.Updateable<Fin_DailyFeePaymentContent>()
-                                  .Where(a => a.DFPId == _fee.Id)
-                                  .SetColumns(a => new Fin_DailyFeePaymentContent
-                                  {
-                                      IsDel = 1,
-                                      DeleteUserId = _fee.CreateUserId,
-                                      DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
-                                  }).ExecuteCommandAsync();
+                    .Where(a => a.DFPId == _fee.Id)
+                    .SetColumns(a => new Fin_DailyFeePaymentContent
+                    {
+                        IsDel = 1,
+                        DeleteUserId = _fee.CreateUserId,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    })
+                    .ExecuteCommandAsync();
 
                 if (_feeContents.Any())
                 {

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -33,7 +33,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         private JsonView _jv;
         private string _url;
         private string _excelPath;
-        
         public GoodsRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
         {
             _mapper = mapper;
@@ -336,6 +335,28 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             return _jv;
         }
 
+        /// <summary>
+        /// 入库/出库 审核类型
+        /// 根据物品类型 处理审核是否需要多部门审核
+        /// </summary>
+        /// <param name="goodsTypeId">物品类型Id </param>
+        /// <returns></returns>
+        public bool GoodsAuditType(int goodsTypeId)
+        {
+            //多部门审核类型Id            
+            var goodsTypeIds = new List<int>() {
+                1420, //1420	贵重物品
+            };
+
+            if (goodsTypeIds.Contains(goodsTypeId))
+            {
+                return true;
+            }
+            
+            return false;
+        }
+
+
         /// <summary>
         /// 物品入库列表(带审核)
         /// </summary>
@@ -376,6 +397,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 {
                     Id = gs.Id,
                     GoodsId = gs.GoodsId,
+                    GoodsType = gi.Type,
                     BatchNo = gs.BatchNo,
                     GoodsName = gi.Name,
                     Quantity = gs.Quantity,
@@ -403,24 +425,24 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             var finAuditInfo = auditList.FirstOrDefault(x => x.AuditDep == GoodsAuditDepEnum.Financial);
             if (hrAuditInfo != null)
             {
-                if (hrAuditInfo.AuditorIds.Any(x => x == userId))
-                {
-                    hrAuditPer = true;
-                }
+                if (hrAuditInfo.AuditorIds.Any(x => x == userId)) hrAuditPer = true;
             }
             if (finAuditInfo != null)
             {
-                if (finAuditInfo.AuditorIds.Any(x => x == userId))
-                {
-                    finAuditPer = true;
-                }
+                if (finAuditInfo.AuditorIds.Any(x => x == userId)) finAuditPer = true;
             }
+
             foreach (var item in data)
             {
-                item.AuditPers = new GoodsStorageAuditPerView[] {
-                    new (){ AuditPer  = hrAuditPer, AuditDep = GoodsAuditDepEnum.Hr, ButtonText = GoodsAuditDepEnum.Hr.GetEnumDescription()},
-                    new (){ AuditPer  = finAuditPer, AuditDep = GoodsAuditDepEnum.Financial, ButtonText = GoodsAuditDepEnum.Financial.GetEnumDescription()}
-                };
+                var auditDeps = new List<GoodsStorageAuditPerView>();
+                auditDeps.Add(new() { AuditPer = hrAuditPer, AuditDep = GoodsAuditDepEnum.Hr, ButtonText = GoodsAuditDepEnum.Hr.GetEnumDescription() });
+                var auditPer = GoodsAuditType(item.GoodsType);
+                if (auditPer)
+                {
+                    auditDeps.Add(new() { AuditPer = finAuditPer, AuditDep = GoodsAuditDepEnum.Financial, ButtonText = GoodsAuditDepEnum.Financial.GetEnumDescription() });
+                }
+
+                item.AuditPers = auditDeps.ToArray();
             }
 
             _jv.Code = StatusCodes.Status200OK;
@@ -488,9 +510,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             _sqlSugar.BeginTran();
             if (info.Id > 0) //修改
             {
-                var selectInfo = await _sqlSugar.Queryable<Pm_GoodsStorage>()
-                                                .Where(x => x.Id == dto.Id)
-                                                .FirstAsync();
+                var selectInfo = await _sqlSugar.Queryable<Pm_GoodsStorage>().FirstAsync(x => x.Id == dto.Id);
                 var auditStatus = selectInfo.ConfirmStatus;
                 if (auditStatus == GoodsConfirmEnum.Confirmed || auditStatus == GoodsConfirmEnum.PartConfirmed)
                 {
@@ -606,6 +626,14 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 return _jv;
             }
 
+            var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().Where(x => x.IsDel == 0 && x.Id == info.GoodsId).FirstAsync();
+            if (goodsInfo == null)
+            {
+                _jv.Msg = string.Format("物品信息不存在!");
+                return _jv;
+            }
+            int goodsTypeId = goodsInfo.Type;
+
             var preChangeStatus = info.ConfirmStatus;
 
             if (preChangeStatus == dto.ConfirmStatus)
@@ -655,21 +683,35 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             //入库确认 更改入库状态及扣或增加除库存数、金额
             var confirmStatus = GoodsConfirmEnum.WaitConfirm;
 
-            if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() >= 2)
-            {
-                confirmStatus = GoodsConfirmEnum.Confirmed;
-            }else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() >= 1)
-            {
-                confirmStatus = GoodsConfirmEnum.PartConfirmed;
-            }
-            else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.UnApproved).Count() > 0)
+            //验证是否需要多级确认
+            var isAuditPer = GoodsAuditType(goodsTypeId);
+
+            if (isAuditPer) //多级审核确认
             {
-                confirmStatus = GoodsConfirmEnum.UnApproved;
+                if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() >= 2)
+                {
+                    confirmStatus = GoodsConfirmEnum.Confirmed;
+                }
+                else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() >= 1)
+                {
+                    confirmStatus = GoodsConfirmEnum.PartConfirmed;
+                }
+                else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.UnApproved).Count() > 0)
+                {
+                    confirmStatus = GoodsConfirmEnum.UnApproved;
+                }
+                else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.PartConfirmed).Count() > 0)
+                {
+                    confirmStatus = GoodsConfirmEnum.PartConfirmed;
+                }
             }
-            else if (preInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.PartConfirmed).Count() > 0)
+            else //人事部审核确认
             {
-                confirmStatus = GoodsConfirmEnum.PartConfirmed;
+                confirmStatus = GoodsConfirmEnum.Confirmed;
+                confirmStatus = dto.ConfirmStatus;
+                preInfos = preInfos.Where(x => x.Dep == GoodsAuditDepEnum.Hr).ToList();
             }
+
             //入库状态描述
             var statusDesc = new StringBuilder();
             foreach (var preInfo in preInfos)
@@ -704,7 +746,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             decimal auditQuantity = info.Quantity,
                     auditTotalPrice = info.TotalPrice;
 
-            var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().FirstAsync(x => x.Id == info.GoodsId);
             goodsInfo.LastUpdateUserId = currUserId;
             goodsInfo.LastUpdateTime = DateTime.Now;
             if (confirmStatus == GoodsConfirmEnum.Confirmed) // 确认状态
@@ -789,7 +830,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         /// 2：出库审核
         /// </param>
         /// <returns></returns>
-        public List<GoodsAuditDepView> GoodsStorageConfirmAuditDep(int auditType=1)
+        public List<GoodsAuditDepView> GoodsStorageConfirmAuditDep(int auditType = 1)
         {
             var auditList = new List<GoodsAuditDepView>();
 
@@ -806,7 +847,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             {
                 AuditDep = GoodsAuditDepEnum.Financial,
                 AuditorIds = new int[] {
-                    187,    // 曾艳 、
+                    187,    // 曾艳 
                     281,    // 伏虹瑾
                     208,    // 雷怡
                 }