优化审核流程和依赖管理

在 `PersonnelModuleController.cs` 中添加了多个命名空间，移除了对 `GroupsController` 的引用，并增加了对 `DecreasePaymentsRepository` 和 `FeeAuditRepository` 的依赖。更新了构造函数的参数列表，修改了审核状态处理逻辑，增加了对 `DecreasePaymentsOpDto` 的构建。

在 `GoodsRepository.cs` 中添加了对 `EyeSoft.Runtime.InteropServices` 和 `Newtonsoft.Json` 的引用，重构了审核逻辑，增加了多人审核的处理，并在审核通过时更新库存和状态描述。

更新了 `GoodsAuditEnum.cs` 中的枚举值描述，确保人事部前台审核的定义。移除了 `Pm_GoodsReceive.cs` 中 `StatusDesc` 属性的默认值设置，直接定义属性。

在 `DecreasePaymentsRepository.cs` 和 `DelegationInfoRepository.cs` 中更新了事务处理逻辑，确保添加和修改操作的正确性。同时增加了多个方法以支持单人和多人审核的状态变更，确保审核流程的完整性和准确性。

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1,5 +1,7 @@
 using Aspose.Cells;
+using EyeSoft.Reflection;
 using FluentValidation;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.SignalR;
 using NPOI.OpenXmlFormats.Dml.Chart;
 using OASystem.API.OAMethodLib;
@@ -15,6 +17,7 @@ using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.Domain.ViewModels.PersonnelModule;
 using OASystem.Domain.ViewModels.QiYeWeChat;
+using OASystem.Infrastructure.Repositories.Groups;
 using OASystem.Infrastructure.Repositories.PersonnelModule;
 using System.Collections;
 using System.Data;
@@ -42,7 +45,8 @@ namespace OASystem.API.Controllers
 
         private readonly IHubContext<ChatHub, IChatClient> _hubContext;
         private readonly GoodsRepository _goodsRep;
-        //private readonly GroupsController _groupsController;
+        private readonly DecreasePaymentsRepository _otherPaymentRep;
+        private readonly FeeAuditRepository _feeAuditRep;
 
         private string url;
         private string path;
@@ -58,7 +62,8 @@ namespace OASystem.API.Controllers
         /// <param name="hubContext"></param>
         /// <param name="goodsRep"></param>
         /// <param name="sqlSugar"></param>
-        ///// <param name="groupsController"></param>
+        /// <param name="otherPaymentRep"></param>
+        /// <param name="feeAuditRep"></param>
         public PersonnelModuleController(
             IHubContext<ChatHub, IChatClient> hubContext,
             IMapper mapper,
@@ -67,8 +72,9 @@ namespace OASystem.API.Controllers
             UsersRepository usersRep,
             TaskAllocationRepository taskAllocationRep,
             GoodsRepository goodsRep,
-            SqlSugarClient sqlSugar
-           // GroupsController groupsController
+            SqlSugarClient sqlSugar,
+            DecreasePaymentsRepository otherPaymentRep,
+            FeeAuditRepository feeAuditRep
             )
         {
             _mapper = mapper;
@@ -89,7 +95,8 @@ namespace OASystem.API.Controllers
             this._taskAllocationRep = taskAllocationRep;
             _hubContext = hubContext;
             _goodsRep = goodsRep;
-            //_groupsController = groupsController;
+            _otherPaymentRep = otherPaymentRep;
+            _feeAuditRep = feeAuditRep;
         }
 
         #region 工资表单
@@ -2158,12 +2165,13 @@ WHERE
                 })
                 .ToArray();
 
-
-            var view = await _goodsRep.GoodsReceiveAudit(idArray, currUserInfo.UserId, dto.AuditEnum);
-
+            //var view = await _goodsRep.GoodsReceiveAudit(idArray, currUserInfo.UserId, dto.AuditEnum);
+            var view = new JsonView() { Code = StatusCodes.Status200OK};
             //TODO：出库成功 并且是团组相关物资 向团组其他款项添加信息
             #region 出库成功并且是团组相关物资 向团组其他款项添加信息
 
+            if (view.Code != StatusCodes.Status200OK) return Ok(view);
+
             if (idArray.Length < 1) return Ok(view);
 
             int receiveId = idArray[0];
@@ -2171,7 +2179,8 @@ WHERE
             var receiveInfo = await _sqlSugar.Queryable<Pm_GoodsReceive>().FirstAsync(x => x.IsDel == 0 && x.Id == receiveId);
             if (receiveInfo == null) return Ok(view);
 
-            if (receiveInfo.AuditStatus != GoodsAuditEnum.OutConfirmed) return Ok(view);
+            var auditEnums = new List<GoodsAuditEnum>(){ GoodsAuditEnum.OutConfirmed , GoodsAuditEnum.OutRejected };
+            if (!auditEnums.Contains( receiveInfo.AuditStatus)) return Ok(view);
 
             var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(x => x.IsDel == 0 && x.Id == receiveInfo.GroupId);
             if (groupInfo == null) return Ok(view);
@@ -2183,15 +2192,78 @@ WHERE
             var basicInfo = basicData.FirstOrDefault(x => x.Name.Equals(goodsInfo.Name));
             if (basicInfo == null) return Ok(view);
 
-            var requestData = new DecreasePaymentsOpDto() {
+            string priceName = basicInfo.Name;
+
+            _ = decimal.TryParse(basicInfo.Remark, out decimal price);
+            decimal total = price * receiveInfo.Quantity;
+
+            var requestData = new DecreasePaymentsOpDto()
+            {
                 Status = 1,
                 DiId = groupInfo.Id,
+                PriceName = priceName,
+                Price = price,
+                Quantity = receiveInfo.Quantity,
+                FeeTotal = total,
+                Currency = 836,
+                FilePath = "",
+                OrbitalPrivateTransfer = 0,
+                OTAOrderNo = "-",
+                OtherBankName = "-",
+                OtherSideName = "-",
+                OtherSideNo = "-",
+                PayDId = 105,
+                SupplierAddress = "-",
+                SupplierArea = 1,
+                SupplierContact = "-",
+                SupplierContactNumber = "-",
+                SupplierEmail = "-",
+                SupplierName = "-",
+                SupplierSocialAccount = "-",
+                SupplierTypeId = 0,
+                CreateUserId = currUserInfo.UserId,
+                Remark = $"物资领用模块添加"
+            };
 
+            //其他费用
 
-            };
-            //var otherFeeView = await _groupsController.OpDecreasePayments(requestData);
+            #region 调用方法
+            JsonView groupData = await _otherPaymentRep.OpDecreasePayments(requestData);
+            if (groupData.Code != 200)
+            {
+                view.Msg += groupData.Msg;
+                return Ok(view);
+            }
 
+            #region 应用推送
+
+            int diId = requestData.DiId, status = requestData.Status;
+
+            int otherId = Convert.ToInt32(groupData.Data.GetType().GetProperty("dataId").GetValue(groupData.Data, null) ?? 0);
+            int ccpId = Convert.ToInt32(groupData.Data.GetType().GetProperty("ccpId").GetValue(groupData.Data, null) ?? 0);
+            int sign = Convert.ToInt32(groupData.Data.GetType().GetProperty("sign").GetValue(groupData.Data, null) ?? 0);
+
+            //自动审核
+            var autoAdit = await _feeAuditRep.FeeAutomaticAudit(3, diId, otherId);
+
+            await AppNoticeLibrary.SendChatMsg_GroupStatus_ApplyFee(ccpId, sign, QiyeWeChatEnum.GuoJiaoLeaderChat);
+
+            //2024-10-21 新增LZ UID
+            var userIds = new List<int>() { 208 };
+            //var userIds = new List<int>() { 21 };
+            string title = $"系统通知";
+            string content = "";
             
+            var ccpInfo = await _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(x => x.Id == ccpId).FirstAsync();
+            if (status == 1) content = $"[新增-其他款项({groupInfo?.TeamName ?? "-"})]一项费用：{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
+            else if (status == 2) content = $"[更新-其他款项({groupInfo?.TeamName ?? "-"})]一项费用：{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
+
+            await GeneralMethod.MessageIssueAndNotification(MessageTypeEnum.GroupBusinessOperations, title, content, userIds, diId);
+
+            //await APNsTools.iOS_PushNotifications1("051", $"其他款项费用审核", "", content);
+
+            #endregion
+            #endregion
 
             #endregion
 

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_GoodsReceive.cs

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 
 namespace OASystem.Domain.Entities.PersonnelModule
 {
-
     /// <summary>
     /// 物品领用表
     /// </summary>
@@ -70,7 +69,8 @@ namespace OASystem.Domain.Entities.PersonnelModule
         /// 领用/出库确认 状态描述
         /// </summary>
         [SugarColumn(ColumnDescription = "领用/出库确认 状态描述", IsNullable = true, ColumnDataType = "varchar(255)")]
-        public string StatusDesc { get; set; } = string.Format("领用确认：状态:待确认  审核人:-  审核时间:-;<br/>人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
+        public string StatusDesc { get; set; }
+        // = string.Format("领用确认：状态:待确认  审核人:-  审核时间:-;<br/>人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
 
     }
 }

OASystem/OASystem.Domain/Enums/GoodsAuditEnum.cs

@@ -13,7 +13,7 @@ namespace OASystem.Domain.Enums
     public enum GoodsAuditEnum :int
     {
         /*
-         * 审核流程 1 领用待确认 2 领用已确认 3 领用确认已拒绝 4 出库待确认 5 出库确认中 6 出库确认完成 7 出库确认拒绝
+         * 审核流程 1 已确认领用 2 已拒绝领用 3 出库待确认 4 出库确认中 5 已完成出库 6 出库确认拒绝
          * 
          */
 
@@ -40,17 +40,17 @@ namespace OASystem.Domain.Enums
         /// <summary>
         /// 出库确认中
         /// </summary>
-        [Description("出库确认中")]
+        [Description("确认中")]
         OutConfirming,
         /// <summary>
         /// 出库确认完成
         /// </summary>
-        [Description("已完成出库")]
+        [Description("已完成")]
         OutConfirmed,
         /// <summary>
         /// 出库确认拒绝
         /// </summary>
-        [Description("已拒绝出库")]
+        [Description("已拒绝")]
         OutRejected,
     }
 
@@ -86,6 +86,11 @@ namespace OASystem.Domain.Enums
     /// </summary>
     public enum GoodsAuditDepEnum : int
     {
+        /// <summary>
+        /// 人事部-前台领用确认
+        /// </summary>
+        [Description("人事部-前台")]
+        Hr_Reception = 0,
         /// <summary>
         /// 人事部
         /// </summary>

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

@@ -61,13 +61,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         {
             get
             {
-                var str = "";
-                if (WaitAuditQuantity > 0)
-                {
-                    str = $"物品待审核数量合计：{WaitAuditQuantity.ToString("#0.00")}";
-                }
-
-                return str;
+                return $"物品待审核数量：{WaitAuditQuantity.ToString("#0.00")}";
             }
         }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -252,7 +252,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         return new JsonView() { Code = 400, Msg = $"添加失败！团组汇率未设置{_sqlSugar.Queryable<Sys_SetData>().First(it => it.IsDel == 0 && it.Id == grp_Decrease.Currency)?.Name ?? ""}该币种汇率!" };
                     }
                     int cId = await _sqlSugar.Insertable(C).ExecuteReturnIdentityAsync();
-                    if (cId != 0)
+                    if (cId > 1)
                     {
                         CommitTran();
                         var data = new { ccpId = cId, sign = 1,dataId = id };
@@ -263,7 +263,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         RollbackTran();
                         return new JsonView() { Code = 400, Msg = "添加失败！" };
                     }
-
                 }
             }
             else if (dto.Status == 2)
@@ -346,9 +345,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         }
                     }
                 }
-
-                RollbackTran();
-                return new JsonView() { Code = 400, Msg = "修改失败！" };
             }
             RollbackTran();
             return new JsonView() { Code = 400, Msg = MsgTips.Fail }; ;

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -1150,7 +1150,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         var info = _groupNameList[i];
                         _groupNameList[i].GroupName = FormartTeamName(info.GroupName);
                     }
-                    _groupNameList.Insert(0, new GroupNameView() { Id = 0, GroupName = "未选择" });
+                    //_groupNameList.Insert(0, new GroupNameView() { Id = 0, GroupName = "未选择" });
                     view.Code = StatusCodes.Status200OK;
                     view.Msg = "成功!";
                     view.Data = _groupNameList;

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

@@ -1,5 +1,6 @@
 using Aspose.Cells;
 using AutoMapper;
+using EyeSoft.Runtime.InteropServices;
 using Newtonsoft.Json;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.PersonnelModule;
@@ -872,7 +873,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
             if (auditType == 1)//入库
             {
-
                 hrAuditorIds.AuditorIds = new int[] {
                     //343,    // 陈湘 
                     374,    // 罗颖
@@ -1400,6 +1400,27 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                             !auditEnums.Contains(x.AuditStatus)
                 ).SumAsync(x => x.Quantity);
 
+            //验证默认审核 多条 or 单条
+            //出库确认默认审核状态
+            var isAuditPer = GoodsAuditType(goodsInfo?.Type ?? 0);
+
+            //验证默认审核 多条审核时添加
+            var goodsAuditInfo1 = new Pm_GoodsAudit(2, GoodsAuditDepEnum.Hr_Reception, info.Id, GoodsConfirmEnum.WaitConfirm, currUserId);
+            var goodsAuditInfo2 = new Pm_GoodsAudit(2, GoodsAuditDepEnum.Hr, info.Id, GoodsConfirmEnum.WaitConfirm, currUserId);
+            var goodsAuditInfos = new List<Pm_GoodsAudit>() { goodsAuditInfo1 };
+            
+            //状态描述
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.Append($"领用确认：状态:待确认  审核人:-  审核时间:-;<br/>");
+
+            if (isAuditPer)
+            {
+                    goodsAuditInfos.Add(goodsAuditInfo2);
+                    stringBuilder.Append($"人事部：状态:待确认  审核人:-  审核时间:-;<br/>");
+            }
+
+            info.StatusDesc = stringBuilder.ToString();
+
             if (info.Id > 0) //修改
             {
                 //审核验证
@@ -1427,29 +1448,20 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                         x.Quantity,
                         x.Reason,
                         x.Remark,
+                        x.StatusDesc,
                     })
                     .Where(x => x.Id == info.Id)
                     .ExecuteCommandAsync();
                 if (edit > 0)
                 {
+                    var auditInfos = await _sqlSugar.Queryable<Pm_GoodsAudit>().Where(x => x.DataId == info.Id).ToListAsync();
+                    if (!auditInfos.Any()) await _sqlSugar.Insertable(goodsAuditInfos).ExecuteCommandAsync();
+
                     _sqlSugar.CommitTran();
                     _jv.Msg = $"操作成功!";
                     _jv.Code = StatusCodes.Status200OK;
                     return _jv;
                 }
-
-                //验证默认审核 多条 or 单挑
-                var isAuditPer = GoodsAuditType(goodsInfo?.Type ?? 0);
-                if (!isAuditPer)
-                {
-                    //出库确认默认审核状态
-                    var goodsAuditList = new List<Pm_GoodsAudit>() {
-                        new (2, GoodsAuditDepEnum.Hr, info.Id, GoodsConfirmEnum.WaitConfirm, currUserId),
-                        //new (2, GoodsAuditDepEnum.Financial, add, GoodsConfirmEnum.WaitConfirm, currUserId)
-                        };
-                    await _sqlSugar.Insertable(goodsAuditList).ExecuteCommandAsync();
-                }
-
             }
             else if (info.Id < 1) //添加
             {
@@ -1463,30 +1475,16 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 }
 
                 var add = await _sqlSugar.Insertable(info).ExecuteReturnIdentityAsync();
-                if (add < 1)
+                if (add > 0)
                 {
-                    _sqlSugar.RollbackTran();
-                    _jv.Msg = $"添加失败!";
-                    _jv.Code = StatusCodes.Status400BadRequest;
-                    return _jv;
-                }
+                    goodsAuditInfos.ForEach(x => x.DataId = add);
+                    await _sqlSugar.Insertable(goodsAuditInfos).ExecuteCommandAsync();
 
-                //验证默认审核 多条 or 单挑
-                var isAuditPer = GoodsAuditType(goodsInfo?.Type ?? 0);
-                if (isAuditPer)
-                {
-                    //出库确认默认审核状态
-                    var goodsAuditList = new List<Pm_GoodsAudit>() {
-                        new (2, GoodsAuditDepEnum.Hr, add, GoodsConfirmEnum.WaitConfirm, currUserId),
-                        //new (2, GoodsAuditDepEnum.Financial, add, GoodsConfirmEnum.WaitConfirm, currUserId)
-                        };
-                    await _sqlSugar.Insertable(goodsAuditList).ExecuteCommandAsync();
+                    _sqlSugar.CommitTran();
+                    _jv.Msg = $"操作成功!";
+                    _jv.Code = StatusCodes.Status200OK;
+                    return _jv;
                 }
-
-                _sqlSugar.CommitTran();
-                _jv.Msg = $"操作成功!";
-                _jv.Code = StatusCodes.Status200OK;
-                return _jv;
             }
             _sqlSugar.RollbackTran();
             return _jv;
@@ -1503,47 +1501,18 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
         {
             if (idArray.Length < 1) return _jv;
 
-            var auditEnums = new List<GoodsAuditEnum>() {
-                GoodsAuditEnum.Pending,
-                GoodsAuditEnum.Approved,
-                GoodsAuditEnum.UnApproved,
-                GoodsAuditEnum.OutPending,
-                GoodsAuditEnum.OutConfirmed,
-                GoodsAuditEnum.OutRejected,
-            };
-
-            if (!auditEnums.Contains(auditEnum))
+            if (!Enum.IsDefined(typeof(GoodsAuditEnum),(int)auditEnum))
             {
                 _jv.Msg = $"出库确认状态超出可用范围!";
                 return _jv;
             }
 
-
             int receiveId = idArray[0];
 
-            //验证审核部门 审核状态 大于等于 OutPending 时 验证
-            var auditDep = GoodsAuditDepEnum.Hr;
-            if (auditEnum >= GoodsAuditEnum.OutPending)
-            {
-                var auditList = GoodsStorageConfirmAuditDep(2);
-                var auditDepInfo = auditList.Find(x => x.AuditorIds.Contains(userId));
-                if (auditDepInfo == null)
-                {
-                    _jv.Msg = string.Format("未分配出库确认权限!");
-                    return _jv;
-                }
-
-                auditDep = auditDepInfo.AuditDep;
-            }
-
             var currUserName = _sqlSugar.Queryable<Sys_Users>().First(x => x.Id == userId)?.CnName ?? "-";
 
             _sqlSugar.BeginTran();
-            var receiveInfo = await _sqlSugar
-                .Queryable<Pm_GoodsReceive>()
-                //.Where(x => x.IsDel == 0 && idArray.Contains(x.Id))
-                .Where(x => x.IsDel == 0 && receiveId == x.Id)
-                .FirstAsync();
+            var receiveInfo = await _sqlSugar.Queryable<Pm_GoodsReceive>().FirstAsync(x => x.IsDel == 0 && receiveId == x.Id);
 
             if (receiveInfo == null)
             {
@@ -1552,6 +1521,10 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 return _jv;
             }
 
+            var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().FirstAsync(x => x.Id == receiveInfo.GoodsId);
+
+            int goodTypeId = goodsInfo?.Type ?? 0;
+
             //审核前状态
             var preChangeStatus = receiveInfo.AuditStatus;
 
@@ -1563,27 +1536,60 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             //    return _jv;
             //}
 
-            switch (auditEnum)
-            {
-                case GoodsAuditEnum.Pending: //领用待确认(取消确认、取消拒绝)
-                    _jv = await GoodsReceivePending(preChangeStatus, receiveId, userId, currUserName, auditEnum);
-                    break;
-                case GoodsAuditEnum.Approved: //领用确认
-                    _jv = await GoodsReceiveApproved(preChangeStatus, receiveId, userId, currUserName, auditEnum);
-                    break;
-                case GoodsAuditEnum.UnApproved: //领用拒绝
-                    _jv = await GoodsReceiveUnApproved(preChangeStatus, receiveId, userId, currUserName, auditEnum);
-                    break;
-                case GoodsAuditEnum.OutPending: //出库待确认(取消出库确认、取消出库拒绝)
-                    _jv = await GoodsReceiveOutPending(preChangeStatus, receiveInfo, userId, auditDep, auditEnum);
-                    break;
-                case GoodsAuditEnum.OutConfirmed: //出库确认
-                    _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);
-
-                    break;
-                case GoodsAuditEnum.OutRejected:  //出库拒绝
-                    _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);
-                    break;
+            var isAuditPer = GoodsAuditType(goodTypeId);
+
+            if (isAuditPer) //多人审核
+            {
+                var auditDep = GoodsAuditDepEnum.Hr_Reception;
+
+                var auditInfo = await _sqlSugar.Queryable<Pm_GoodsAudit>()
+                    .FirstAsync(x => x.Type == 2 && x.DataId == receiveInfo.Id && x.Dep == GoodsAuditDepEnum.Hr_Reception);
+                if (auditInfo != null && auditInfo.AuditStatus == GoodsConfirmEnum.Confirmed)
+                {
+                    auditDep = GoodsAuditDepEnum.Hr;
+
+                    //多人审核的时候验证审核权限
+                    var auditList = GoodsStorageConfirmAuditDep(2);
+                    var auditDepInfo = auditList.Find(x => x.AuditorIds.Contains(userId));
+                    if (auditDepInfo == null)
+                    {
+                        _jv.Msg = string.Format("未分配出库确认权限!");
+                        _sqlSugar.RollbackTran();
+                        return _jv;
+                    }
+                }
+
+                // 确认中 确认 拒绝 
+                _jv = await GoodsReceiveOutConfirmingMultiple(receiveInfo, userId, auditDep, auditEnum);
+
+                //switch (auditEnum)
+                //{
+                //    case GoodsAuditEnum.Pending: //领用待确认(取消确认、取消拒绝)
+                //        _jv = await GoodsReceivePending(preChangeStatus, receiveId, userId, currUserName, auditEnum);
+                //        break;
+                //    case GoodsAuditEnum.Approved: //领用确认
+                //        _jv = await GoodsReceiveApproved(preChangeStatus, receiveId, userId, currUserName, auditEnum);
+                //        break;
+                //    case GoodsAuditEnum.UnApproved: //领用拒绝
+                //        _jv = await GoodsReceiveUnApproved(preChangeStatus, receiveId, userId, currUserName, auditEnum);
+                //        break;
+                //    case GoodsAuditEnum.OutPending: //出库待确认(取消出库确认、取消出库拒绝)
+                //        _jv = await GoodsReceiveOutPending(preChangeStatus, receiveInfo, userId, auditDep, auditEnum);
+                //        break;
+                //    case GoodsAuditEnum.OutConfirmed: //出库确认
+                //        _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);
+                //        break;
+                //    case GoodsAuditEnum.OutRejected:  //出库拒绝
+                //        _jv = await GoodsReceiveOutConfirming(receiveInfo, userId, auditDep, auditEnum);
+                //        break;
+                //}
+
+            }
+            else //单人审核 
+            {
+                //领用确认 --> 已确认 / 领用拒绝 --> 已拒绝
+                _jv = await GoodsReceiveOutConfirmingSingle(receiveInfo,userId, currUserName,auditEnum);
+                
             }
 
             if (_jv.Code == StatusCodes.Status200OK)
@@ -1598,6 +1604,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             return _jv;
         }
 
+        #region 多人审核状态变更
+
         /// <summary>
         /// 物品领用状态 - 领用待确认(取消确认、取消拒绝)
         /// </summary>
@@ -2024,8 +2032,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 statusDesc.Append(auditInfStatusDesc);
             }
 
-
-
             if (preChangeStatus == auditEnum)
             {
                 _jv.Msg = $"此操作已执行,不可重复操作!";
@@ -2196,6 +2202,547 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             return _jv;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="receiveInfo"></param>
+        /// <param name="userId"></param>
+        /// <param name="depEnum"></param>
+        /// <param name="auditEnum"></param>
+        /// <returns></returns>
+        public async Task<JsonView> GoodsReceiveOutConfirmingMultiple(Pm_GoodsReceive receiveInfo, int userId, GoodsAuditDepEnum depEnum, GoodsAuditEnum auditEnum)
+        {
+            _jv.Code = StatusCodes.Status400BadRequest;
+
+            //更改前状态
+            receiveInfo.CreateUserId = userId;
+            var preChangeStatus = receiveInfo.AuditStatus;
+            var currUserOpDt = DateTime.Now;
+            var currUserOpTime = currUserOpDt.ToString("yyyy-MM-dd HH:mm:ss");
+            var receiveUserName = _sqlSugar.Queryable<Sys_Users>().First(x => x.Id == receiveInfo.AuditUserId)?.CnName ?? "-";
+
+            var auditInfos = await _sqlSugar.Queryable<Pm_GoodsAudit>()
+                .Where(x => x.IsDel == 0 && x.DataId == receiveInfo.Id && x.Type == 2)
+                .ToListAsync();
+
+            var auditStatus = GoodsConfirmEnum.WaitConfirm;
+            if (auditEnum == GoodsAuditEnum.UnApproved) auditStatus = GoodsConfirmEnum.UnApproved;
+            else if (auditEnum == GoodsAuditEnum.Approved) auditStatus = GoodsConfirmEnum.Confirmed;
+
+            var auditInfo = auditInfos.Find(x => x.Dep == depEnum);
+
+            if (auditInfo == null)
+            {
+                auditInfo = new Pm_GoodsAudit(2, depEnum, receiveInfo.Id, auditStatus, userId);
+                auditInfo.AuditUserId = userId;
+                var addStatus = await _sqlSugar.Insertable(auditInfo).ExecuteCommandAsync();
+                if (addStatus < 1)
+                {
+                    _jv.Msg = $"出库确认操作失败!";
+                    return _jv;
+                }
+                auditInfos.Add(auditInfo);
+            }
+            else
+            {
+                //移除旧数据
+                auditInfos.Remove(auditInfo);
+                auditInfo.AuditStatus = auditStatus;
+                auditInfo.AuditUserId = userId;
+                auditInfo.AuditTime = currUserOpDt;
+                var updStatus = await _sqlSugar.Updateable<Pm_GoodsAudit>()
+                    .SetColumns(x => new Pm_GoodsAudit()
+                    {
+                        AuditStatus = auditStatus,
+                        AuditUserId = userId,
+                        AuditTime = currUserOpDt
+                    })
+                    .Where(x => x.Id == auditInfo.Id)
+                    .ExecuteCommandAsync();
+
+                if (updStatus < 1)
+                {
+                    _jv.Msg = $"出库确认操作失败!";
+                    return _jv;
+                }
+
+                //添加更新后的数据
+                auditInfos.Add(auditInfo);
+            }
+            auditInfos = auditInfos.OrderBy(x => x.Dep).ToList();
+            //处理状态描述
+            StringBuilder statusDesc = new StringBuilder();
+            foreach (var auditInf in auditInfos)
+            {
+                string auditType = auditInf.Dep == GoodsAuditDepEnum.Hr ? "人事部" : "领用确认";
+                string userName = _sqlSugar.Queryable<Sys_Users>().First(x => x.Id == auditInf.AuditUserId)?.CnName ?? "-";
+                string userOpTime = !userName.Equals("-") ? auditInf.AuditTime.ToString("yyyy-MM-dd HH:mm:ss") : "-";
+                string auditInfStatusDesc = string.Format("{0}：状态:{1}  审核人:{2}  审核时间:{3};<br/>",
+                       auditType, auditInf.AuditStatus.GetEnumDescription(), userName, currUserOpTime);
+                statusDesc.Append(auditInfStatusDesc);
+            }
+
+            if (preChangeStatus == auditEnum)
+            {
+                _jv.Msg = $"此操作已执行,不可重复操作!";
+                return _jv;
+            }
+
+            //批次库存信息
+            string goodsStorageInfo = receiveInfo.GoodsStorageInfo;
+
+            //更改领用状态及库存
+            if (auditInfos.Any(x => x.AuditStatus == GoodsConfirmEnum.UnApproved))
+            {
+                //出库确认拒绝
+                auditEnum = GoodsAuditEnum.OutRejected;
+
+                if (preChangeStatus == GoodsAuditEnum.OutConfirmed)
+                {
+                    //回滚库存
+                    _jv = await GoodsInventoryRollback(receiveInfo);
+                    if (_jv.Code != StatusCodes.Status200OK) return _jv;
+                }
+
+            }
+            else if (auditInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() == 2)
+            {
+                //1.出库确认完成
+                auditEnum = GoodsAuditEnum.OutConfirmed;
+
+                //2.更改前的状态为出库确认中 且 更改后的状态为出库确认完成 执行库存减操作
+                if (preChangeStatus == GoodsAuditEnum.OutConfirming || preChangeStatus == GoodsAuditEnum.OutRejected)
+                {
+                    //2.1 更改库存
+                    var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().Where(x => x.Id == receiveInfo.GoodsId).FirstAsync();
+                    goodsInfo.StockQuantity -= receiveInfo.Quantity;
+                    goodsInfo.OQ_Total += receiveInfo.Quantity;
+                    goodsInfo.LastUpdateTime = DateTime.Now;
+                    goodsInfo.LastUpdateUserId = userId;
+
+                    var editGoods = await _sqlSugar
+                        .Updateable(goodsInfo)
+                        .UpdateColumns(x => new
+                        {
+                            x.StockQuantity,
+                            x.OQ_Total,
+                            x.LastUpdateUserId,
+                            x.LastUpdateTime,
+                        })
+                        .Where(x => x.Id == receiveInfo.GoodsId)
+                        .ExecuteCommandAsync();
+
+                    if (editGoods < 1)
+                    {
+                        _jv.Msg = $"库存更新失败!";
+                        return _jv;
+                    }
+
+                    //2.2 入库批次关联领用人 更改批次库存
+                    var goodsStorages = await _sqlSugar
+                        .Queryable<Pm_GoodsStorage>()
+                        .Where(x => x.IsDel == 0 &&
+                                    x.GoodsId == receiveInfo.GoodsId &&
+                                    (x.Quantity - x.ReceiveQuantity) > 0
+                            )
+                        .OrderBy(x => x.CreateTime)
+                        .ToListAsync();
+
+                    var goodsReceiveInfos = new List<GoodsReceiveLinkStorageView>();
+                    var batchStorageInfos = new List<Pm_GoodsStorage>();
+                    var receiveQuantity = 0.00M; //领用总数量
+                    foreach (var storage in goodsStorages)
+                    {
+                        if (receiveInfo.Quantity == receiveQuantity) break;
+
+                        var thisBatchSurplusQuantity = storage.Quantity - storage.ReceiveQuantity;
+                        if (thisBatchSurplusQuantity <= 0.00M) continue;
+
+                        var thisBatchReceiveQuantity = 0.00M; //此批次领用数量
+                        const decimal unit = 0.50M;
+                        while (receiveQuantity < receiveInfo.Quantity)
+                        {
+                            if (thisBatchSurplusQuantity == thisBatchReceiveQuantity) break;
+
+                            thisBatchReceiveQuantity += unit;
+                            receiveQuantity += unit;
+                        }
+                        goodsReceiveInfos.Add(new GoodsReceiveLinkStorageView
+                        {
+                            StorageId = storage.Id,
+                            Quantity = thisBatchReceiveQuantity
+                        });
+                        storage.ReceiveQuantity += thisBatchReceiveQuantity;
+                        var storageUpd = storage;
+                        //storageUpd.ReceiveQuantity += thisBatchReceiveQuantity;
+                        batchStorageInfos.Add(storageUpd);
+                    }
+
+                    //2.2.1 更改批次库存
+                    if (goodsReceiveInfos.Count > 0)
+                    {
+                        var edit1 = await _sqlSugar.Updateable(batchStorageInfos)
+                            .UpdateColumns(x => x.ReceiveQuantity)
+                            .WhereColumns(x => x.Id)
+                            .ExecuteCommandAsync();
+                        if (edit1 < 1)
+                        {
+                            _jv.Msg = $"批次库存更新失败!";
+                            return _jv;
+                        }
+                    }
+
+                    //2.2.2 添加入库批次关联领用人
+                    if (goodsReceiveInfos.Count > 0)
+                    {
+                        goodsStorageInfo = JsonConvert.SerializeObject(goodsReceiveInfos);
+                    }
+                }
+
+            }
+            else if (auditInfos.Where(x => x.AuditStatus == GoodsConfirmEnum.Confirmed).Count() == 1)
+            {
+                //出库确认中
+                auditEnum = GoodsAuditEnum.OutConfirming;
+
+                if (preChangeStatus == GoodsAuditEnum.OutConfirmed)
+                {
+                    //回滚库存
+                    _jv = await GoodsInventoryRollback(receiveInfo);
+                    if (_jv.Code != StatusCodes.Status200OK) return _jv;
+                }
+            }
+            else auditEnum = GoodsAuditEnum.OutPending;
+
+            var statusDesc1 = statusDesc.ToString();
+
+            var changeStatus = await _sqlSugar
+                .Updateable<Pm_GoodsReceive>()
+                .SetColumns(x => new Pm_GoodsReceive()
+                {
+                    AuditStatus = auditEnum,
+                    StatusDesc = statusDesc1,
+                    GoodsStorageInfo = goodsStorageInfo,
+                })
+                .Where(x => x.Id == receiveInfo.Id)
+                .ExecuteCommandAsync();
+
+            if (changeStatus > 0)
+            {
+                _jv.Code = StatusCodes.Status200OK;
+            }
+
+            return _jv;
+        }
+
+        /// <summary>
+        /// 物品库存回滚
+        /// </summary>
+        /// <param name="receiveInfo"></param>
+        /// <returns></returns>
+        public async Task<JsonView> GoodsInventoryRollback(Pm_GoodsReceive receiveInfo)
+        {
+            var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().FirstAsync(x => x.Id == receiveInfo.GoodsId);
+
+            //回滚库存
+            var changeGoods = await _sqlSugar
+                .Updateable(goodsInfo)
+                .ReSetValue(it => {
+                    it.StockQuantity += receiveInfo.Quantity;
+                    it.OQ_Total -= receiveInfo.Quantity;
+                    it.LastUpdateTime = DateTime.Now;
+                    it.LastUpdateUserId = receiveInfo.CreateUserId;
+                })
+                .ExecuteCommandAsync();
+
+            if (changeGoods < 1)
+            {
+                _jv.Msg = $"库存回滚失败!";
+                return _jv;
+            }
+            //批次领用记录
+            _jv.Code = StatusCodes.Status200OK;
+            var goodsStorageInfo = receiveInfo.GoodsStorageInfo;
+
+            if (string.IsNullOrEmpty(goodsStorageInfo)) return _jv;
+
+            var goodsStorageInfos = JsonConvert.DeserializeObject<List<GoodsReceiveLinkStorageView>>(goodsStorageInfo);
+
+            if (!goodsStorageInfos.Any()) return _jv;
+
+            foreach (var item in goodsStorageInfos)
+            {
+                var newStorageInfo = await _sqlSugar.Queryable<Pm_GoodsStorage>()
+                    .Where(x => x.IsDel == 0 && x.Id == item.StorageId)
+                    .FirstAsync();
+                if (newStorageInfo == null) continue;
+
+                var newEdit = await _sqlSugar.Updateable(newStorageInfo)
+                        .ReSetValue(x => x.ReceiveQuantity = x.ReceiveQuantity - item.Quantity)
+                        .ExecuteCommandAsync();
+
+                if (newEdit < 1)
+                {
+                    _jv.Code = StatusCodes.Status400BadRequest;
+                    _jv.Msg = $"批次领用库存更新失败!";
+                    return _jv;
+                }
+            }
+
+            _jv.Code = StatusCodes.Status200OK;
+            return _jv;
+        }
+
+        #endregion
+
+        #region 单人审核状态变更
+
+        /// <summary>
+        /// 物品领用状态 - 出库确认完成、出库确认拒绝
+        /// </summary>
+        /// <param name="receiveInfo"></param>
+        /// <param name="userId"></param>
+        /// <param name="currUserName"></param>
+        /// <param name="auditEnum"></param>
+        /// <returns></returns>
+        public async Task<JsonView> GoodsReceiveOutConfirmingSingle(Pm_GoodsReceive receiveInfo, int userId,string currUserName,GoodsAuditEnum auditEnum)
+        {
+            _jv.Code = StatusCodes.Status400BadRequest;
+
+            //状态操作范围验证
+            var auditEnums = new List<GoodsAuditEnum>() {
+                GoodsAuditEnum.Pending,
+                GoodsAuditEnum.Approved,
+                GoodsAuditEnum.UnApproved,
+            };
+
+            if (!auditEnums.Contains(auditEnum))
+            {
+                _jv.Msg = $"{GoodsAuditEnum.Pending.GetEnumDescription()}、{GoodsAuditEnum.OutConfirmed.GetEnumDescription()}、{GoodsAuditEnum.OutRejected.GetEnumDescription()},状态下可操作！";
+                return _jv;
+            }
+
+            var currUserOpDt = DateTime.Now;
+            var currUserOpTime = currUserOpDt.ToString("yyyy-MM-dd HH:mm:ss");
+
+            //更改前状态
+            var preChangeStatus = receiveInfo.AuditStatus;
+
+            //前台状态验证
+            var auditInfo = await _sqlSugar.Queryable<Pm_GoodsAudit>().FirstAsync(x => x.IsDel == 0 && x.Type == 2 && x.DataId == receiveInfo.Id);
+            if (auditInfo == null)
+            {
+                var addInfo = new Pm_GoodsAudit(2, GoodsAuditDepEnum.Hr_Reception, receiveInfo.Id, GoodsConfirmEnum.WaitConfirm, userId);
+                auditInfo = await _sqlSugar.Insertable(addInfo).ExecuteReturnEntityAsync();
+                if (auditInfo == null)
+                {
+                    _jv.Msg = $"确认操作失败!";
+                    return _jv;
+                }
+            }
+
+            if (auditEnum == GoodsAuditEnum.Approved)
+            {
+                auditInfo.AuditStatus = GoodsConfirmEnum.Confirmed;
+                auditEnum = GoodsAuditEnum.OutConfirmed;
+            }
+            else if (auditEnum == GoodsAuditEnum.UnApproved)
+            {
+                auditInfo.AuditStatus = GoodsConfirmEnum.UnApproved;
+                auditEnum = GoodsAuditEnum.OutRejected;
+            }
+
+            if (preChangeStatus == auditEnum)
+            {
+                _jv.Msg = $"此操作已执行,不可重复操作!";
+                return _jv;
+            }
+
+            //更新子表审核状态
+            var updStatus = await _sqlSugar.Updateable<Pm_GoodsAudit>()
+                    .SetColumns(x => new Pm_GoodsAudit()
+                    {
+                        AuditStatus = auditInfo.AuditStatus,
+                        AuditUserId = userId,
+                        AuditTime = currUserOpDt
+                    })
+                    .Where(x => x.Id == auditInfo.Id)
+                    .ExecuteCommandAsync();
+
+            if (updStatus < 1)
+            {
+                _jv.Msg = $"确认操作失败!";
+                return _jv;
+            }
+
+            //处理状态描述
+            StringBuilder statusDesc = new StringBuilder();
+            statusDesc.Append(string.Format("领用确认：状态:{0}  审核人:{1}  审核时间:{2};", auditInfo.AuditStatus.GetEnumDescription(), currUserName, currUserOpTime));
+            
+            //批次库存信息
+            string goodsStorageInfo = receiveInfo.GoodsStorageInfo;
+
+            if (auditEnum == GoodsAuditEnum.OutConfirmed) //出库确认
+            {
+                //1 更改库存
+                var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().Where(x => x.Id == receiveInfo.GoodsId).FirstAsync();
+                goodsInfo.StockQuantity -= receiveInfo.Quantity;
+                goodsInfo.OQ_Total += receiveInfo.Quantity;
+                goodsInfo.LastUpdateTime = DateTime.Now;
+                goodsInfo.LastUpdateUserId = userId;
+
+                var editGoods = await _sqlSugar.Updateable(goodsInfo)
+                    .UpdateColumns(x => new
+                    {
+                        x.StockQuantity,
+                        x.OQ_Total,
+                        x.LastUpdateUserId,
+                        x.LastUpdateTime,
+                    })
+                    .Where(x => x.Id == receiveInfo.GoodsId)
+                    .ExecuteCommandAsync();
+
+                if (editGoods < 1)
+                {
+                    _jv.Msg = $"库存更新失败!";
+                    return _jv;
+                }
+
+                //2 入库批次关联领用人 更改批次库存
+                var goodsStorages = await _sqlSugar
+                    .Queryable<Pm_GoodsStorage>()
+                    .Where(x => x.IsDel == 0 &&
+                                x.GoodsId == receiveInfo.GoodsId &&
+                                (x.Quantity - x.ReceiveQuantity) > 0
+                        )
+                    .OrderBy(x => x.CreateTime)
+                    .ToListAsync();
+
+                var goodsReceiveInfos = new List<GoodsReceiveLinkStorageView>();
+                var batchStorageInfos = new List<Pm_GoodsStorage>();
+                var receiveQuantity = 0.00M; //领用总数量
+                foreach (var storage in goodsStorages)
+                {
+                    if (receiveInfo.Quantity == receiveQuantity) break;
+
+                    var thisBatchSurplusQuantity = storage.Quantity - storage.ReceiveQuantity;
+                    if (thisBatchSurplusQuantity <= 0.00M) continue;
+
+                    var thisBatchReceiveQuantity = 0.00M; //此批次领用数量
+                    const decimal unit = 0.50M;
+                    while (receiveQuantity < receiveInfo.Quantity)
+                    {
+                        if (thisBatchSurplusQuantity == thisBatchReceiveQuantity) break;
+
+                        thisBatchReceiveQuantity += unit;
+                        receiveQuantity += unit;
+                    }
+                    goodsReceiveInfos.Add(new GoodsReceiveLinkStorageView
+                    {
+                        StorageId = storage.Id,
+                        Quantity = thisBatchReceiveQuantity
+                    });
+                    storage.ReceiveQuantity += thisBatchReceiveQuantity;
+                    var storageUpd = storage;
+                    //storageUpd.ReceiveQuantity += thisBatchReceiveQuantity;
+                    batchStorageInfos.Add(storageUpd);
+                }
+
+                //3 更改批次库存
+                if (goodsReceiveInfos.Count > 0)
+                {
+                    var edit1 = await _sqlSugar.Updateable(batchStorageInfos)
+                        .UpdateColumns(x => x.ReceiveQuantity)
+                        .WhereColumns(x => x.Id)
+                        .ExecuteCommandAsync();
+                    if (edit1 < 1)
+                    {
+                        _jv.Msg = $"批次库存更新失败!";
+                        return _jv;
+                    }
+                }
+
+                //4 添加入库批次关联领用人
+                if (goodsReceiveInfos.Count > 0)
+                {
+                    goodsStorageInfo = JsonConvert.SerializeObject(goodsReceiveInfos);
+                }
+
+
+            }
+            else if (auditEnum == GoodsAuditEnum.OutRejected) //出库拒绝
+            {
+                //拒绝之前的状态为已完成 回滚库存
+                if (preChangeStatus == GoodsAuditEnum.OutConfirmed)
+                {
+                    //回滚库存
+                    var goodsInfo = await _sqlSugar.Queryable<Pm_GoodsInfo>().FirstAsync(x => x.Id == receiveInfo.GoodsId);
+
+                    var changeGoods = await _sqlSugar
+                        .Updateable(goodsInfo)
+                        .ReSetValue(it => {
+                            it.StockQuantity += receiveInfo.Quantity;
+                            it.OQ_Total -= receiveInfo.Quantity;
+                            it.LastUpdateTime = DateTime.Now;
+                            it.LastUpdateUserId = userId;
+                        })
+                        .ExecuteCommandAsync();
+
+                    if (changeGoods < 1)
+                    {
+                        _jv.Msg = $"库存回滚失败!";
+                        return _jv;
+                    }
+
+                    //批次号库存 信息更新
+                    var goodsStorageInfo1 = receiveInfo.GoodsStorageInfo;
+                    if (!string.IsNullOrEmpty(goodsStorageInfo))
+                    {
+                        var goodsStorageInfos = JsonConvert.DeserializeObject<List<GoodsReceiveLinkStorageView>>(goodsStorageInfo);
+                        if (goodsStorageInfos.Any())
+                        {
+                            foreach (var item in goodsStorageInfos)
+                            {
+                                var newStorageInfo = await _sqlSugar.Queryable<Pm_GoodsStorage>()
+                                    .Where(x => x.IsDel == 0 && x.Id == item.StorageId)
+                                    .FirstAsync();
+                                if (newStorageInfo == null) continue;
+
+                                var newEdit = await _sqlSugar.Updateable(newStorageInfo)
+                                        .ReSetValue(x => x.ReceiveQuantity = x.ReceiveQuantity - item.Quantity)
+                                        .ExecuteCommandAsync();
+
+                                if (newEdit < 1)
+                                {
+                                    _jv.Msg = $"批次领用库存更新失败!";
+                                    return _jv;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            var statusDesc1 = statusDesc.ToString();
+
+            var changeStatus = await _sqlSugar
+                .Updateable<Pm_GoodsReceive>()
+                .SetColumns(x => new Pm_GoodsReceive()
+                {
+                    AuditStatus = auditEnum,
+                    StatusDesc = statusDesc1,
+                    GoodsStorageInfo = goodsStorageInfo,
+                })
+                .Where(x => x.Id == receiveInfo.Id)
+                .ExecuteCommandAsync();
+
+            if (changeStatus > 0) _jv.Code = StatusCodes.Status200OK;
+
+            return _jv;
+        }
+
+        #endregion
+
         /// <summary>
         /// 物品领用 Del
         /// </summary>