Browse Source

更新审核状态描述及领用出库逻辑

在 `GoodsDTO.cs` 中更新审核状态的描述信息。
在 `GoodsRepository.cs` 中新增 `receiveStatus` 列表以表示领用出库状态,并将其添加到返回数据中。
增加对 `auditLabel` 的处理逻辑,移除值为 -1 的标签。
注释掉与状态描述相关的代码,移除不再使用的 `StringBuilder`。
完善对 `GoodsAuditEnum.OutConfirmed` 和 `GoodsAuditEnum.OutRejected` 状态的处理,并添加 TODO 注释以提示后续改进。
LEIYI 2 weeks ago
parent
commit
99323bc5e2

+ 1 - 1
OASystem/OASystem.Domain/Dtos/PersonnelModule/GoodsDTO.cs

@@ -357,7 +357,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         public string Label { get; set; }
 
         /// <summary>
-        /// 审核状态 可用状态 1:取消确认、取消拒绝 1:领用确认 2:领用拒绝 3:出库确认、出库拒绝 5:出库确认 6:出库拒绝
+        /// 审核状态 可用状态 0:取消领用确认、取消领用拒绝 1:领用确认 2:领用拒绝 3:取消出库确认、取消出库拒绝 5:出库确认 6:出库拒绝
         /// </summary>
         public GoodsAuditEnum AuditEnum { get; set; }
     }

+ 22 - 3
OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -102,9 +102,20 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 new { Value = 3, Text = "已拒绝" },
             };
 
+            //领用出库状态
+            var receiveStatus  = new List<dynamic>() {
+                new { Value = -1, Text = "全部" },
+                new { Value = GoodsAuditEnum.Pending, Text = GoodsAuditEnum.Pending.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.Approved, Text = GoodsAuditEnum.Approved.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.UnApproved, Text = GoodsAuditEnum.UnApproved.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.OutPending, Text = GoodsAuditEnum.OutPending.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.OutConfirming, Text = GoodsAuditEnum.OutConfirming.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.OutConfirmed, Text = GoodsAuditEnum.OutConfirmed.GetEnumDescription() },
+                new { Value = GoodsAuditEnum.OutRejected, Text = GoodsAuditEnum.OutRejected.GetEnumDescription() },
+            };
 
             _jv.Code = StatusCodes.Status200OK;
-            _jv.Data = new { goodsTypeData = typeData, stockStatus = stockStatus, groupNameData = groupData, userNameData = userData };
+            _jv.Data = new { goodsTypeData = typeData, stockStatus = stockStatus, receiveStatus = receiveStatus, groupNameData = groupData, userNameData = userData };
             _jv.Msg = $"操作成功";
             return _jv;
         }
@@ -1068,10 +1079,18 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                     .Split(',')
                     .Select(x =>
                     {
+
+
                         if (int.TryParse(x, out var id)) return id;
                         return id;
                     })
                     .ToArray();
+
+                if (auditLabel.Any(x => x == -1))
+                {
+                    auditLabel = auditLabel.Where(x => x != -1).ToArray();
+                }
+
             }
             if (!string.IsNullOrEmpty(dto.GroupLabel))
             {
@@ -1476,8 +1495,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             //    return _jv;
             //}
 
-            StringBuilder statusDesc = new StringBuilder();
-            //string.Format("领用确认:状态:待确认  审核人:-  审核时间:-;<br/>人事部:状态:待确认  审核人:-  审核时间:-;<br/>财务部:状态:待确认  审核人:-  审核时间:-;");
             switch (auditEnum)
             {
                 case GoodsAuditEnum.Pending: //领用待确认(取消确认、取消拒绝)
@@ -1494,6 +1511,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                     break;
                 case GoodsAuditEnum.OutConfirmed: //出库确认
                     _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);
+                    //TODO:出库成功 并且是团组相关物资 向团组其他款项添加信息
+
                     break;
                 case GoodsAuditEnum.OutRejected:  //出库拒绝
                     _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);