Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/EntitySync/Program.cs

@@ -153,6 +153,7 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Sys_FormTemp), //表单模板
     //typeof(Grp_OrderPreInfo), //团组下单前信息
     //typeof(Grp_OrderPreItem), //团组下单前信息Item
-    typeof(Grp_GroupShareFile),//团组共享文件
+    //typeof(Grp_GroupShareFile),//团组共享文件 
+    typeof(Pm_GoodsAudit),//物品确认审核表 
 }); 
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2232,8 +2232,8 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         private CompanyInfo ExpenseCompanyByTeamId(int teamId)
         {
-            CompanyInfo _companyInfo = new CompanyInfo()
-            {
+            CompanyInfo _companyInfo = new CompanyInfo() {
+
                 Id = 2,
                 ConpanyName = "四川泛美交流有限公司"
             };

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -13234,7 +13234,7 @@ FROM
             var cityFilter = new List<string>() { "全部城市", "其他城市" };
             var currencys = await _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && x.STid == 66).ToListAsync();
             var eecRates = infoView.Currencys;
-
+             
             var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(x => x.Id == dto.DiId && x.IsDel == 0);
             int pplNum = 1;
             if (groupInfo != null) pplNum = groupInfo.VisitPNumber;

OASystem/OASystem.Api/Controllers/MarketCustomerResourcesController.cs

@@ -1199,7 +1199,8 @@ namespace OASystem.API.Controllers
 
             var count = 0;
 
-            var notClentUser = new List<int>() { 21, 95  , 327 };
+            //var notClentUser = new List<int>() { 21, 95  , 327 };
+            var notClentUser = new List<int>() { 213,327 };
 
             var insertList = new List<Crm_ClientDataAndUser>();
 

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1915,7 +1915,7 @@ WHERE
         }
 
         /// <summary>
-        /// 物资进销存
+        /// 物资进销存(审核，需传token)
         /// 入库 列表
         /// </summary>
         /// <returns></returns>
@@ -1923,10 +1923,15 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GoodsStorageList(GoodsStorageListDto dto)
         {
+            //var currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            //if (currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
             if (dto.PortType < 1 || dto.PortType > 3) return Ok(JsonView(false, MsgTips.Port));
             if (dto.PageIndex < 1 || dto.PageSize < 1) return Ok(JsonView(false, MsgTips.PageIndex));
 
             return Ok(await _goodsRep.GoodsStorageList(dto));
+            //return Ok(await _goodsRep.GoodsStorageList(dto, 0));
+
         }
 
         /// <summary>
@@ -1968,6 +1973,38 @@ WHERE
             return Ok(await _goodsRep.GoodsStorageOp(dto, currUserInfo.UserId));
         }
 
+        /// <summary>
+        /// 物资进销存
+        /// 入库确认状态变更
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GoodsStorageConfirmStatusChange(GoodsStorageConfirmDto dto)
+        {
+            if (dto.Id < 1) return Ok(JsonView(false, MsgTips.Id));
+
+            if (!Enum.IsDefined(typeof(GoodsAuditDepEnum),(int)dto.AuditDep))
+            {
+                return Ok(JsonView(false, $"审核部门类型超出可用范围!"));
+            }
+
+            if (!Enum.IsDefined(typeof(GoodsConfirmEnum), (int)dto.ConfirmStatus))
+            {
+                return Ok(JsonView(false, $"入库审核状态超出可用范围!"));
+            }
+
+            if (dto.ConfirmStatus == GoodsConfirmEnum.WaitConfirm || dto.ConfirmStatus == GoodsConfirmEnum.PartConfirmed)
+            {
+                return Ok(JsonView(false, $"入库审核状态(待确认、部分确认)不可用!"));
+            }
+
+            var currUserInfo = JwtHelper.SerializeJwt(HttpContext.Request.Headers.Authorization);
+            if (currUserInfo == null) return Ok(JsonView(false, "请传入token!"));
+
+            return Ok(await _goodsRep.GoodsStorageConfirmStatusChange(dto, currUserInfo.UserId));
+        }
+
         /// <summary>
         /// 物资进销存
         /// 入库 Del
@@ -1986,7 +2023,6 @@ WHERE
             return Ok(await _goodsRep.GoodsStorageDel(id, currUserInfo.UserId));
         }
 
-
         /// <summary>
         /// 物资进销存
         /// 入库 excelDownload
@@ -2046,7 +2082,7 @@ WHERE
                 if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您未分配文件下载权限!"));
                 #endregion
             }
-
+            dto.CurrUserId = currUserInfo.UserId;
             return Ok(await _goodsRep.GoodsReceiveList(dto));
         }
 
@@ -2111,13 +2147,13 @@ WHERE
                 return Ok(JsonView(false, sb.ToString()));
             }
             int[] idArray = dto.Label
-                                .Split(',')
-                                .Select(x =>
-                                {
-                                    if (int.TryParse(x, out var id)) return id; 
-                                    return id;
-                                })
-                                .ToArray();
+                .Split(',')
+                .Select(x =>
+                {
+                    if (int.TryParse(x, out var id)) return id; 
+                    return id;
+                })
+                .ToArray();
             return Ok(await _goodsRep.GoodsReceiveAudit(idArray, currUserInfo.UserId, dto.AuditEnum));
         }
 

OASystem/OASystem.Api/GlobalUsings.cs

@@ -36,5 +36,6 @@ global using System.Reflection;
 global using System.Security.Cryptography;
 global using System.Text;
 global using System.Text.RegularExpressions;
+global using SqlSugar;
 
 

OASystem/OASystem.Api/Middlewares/ExceptionHandlingMiddleware.cs

@@ -1,4 +1,5 @@
-namespace OASystem.API.Middlewares
+
+namespace OASystem.API.Middlewares
 {
     /// <summary>
     /// 全局异常捕获中间件
@@ -23,8 +24,9 @@
         /// 执行中间件
         /// </summary>
         /// <param name="httpContext"></param>
+        /// <param name="db"></param>
         /// <returns></returns>
-        public async Task InvokeAsync(HttpContext httpContext)
+        public async Task InvokeAsync(HttpContext httpContext, ISqlSugarClient db)
         {
             try
             {
@@ -32,7 +34,7 @@
             }
             catch (Exception ex)
             {
-                await HandleExceptionAsync(httpContext, ex); // 捕获异常了 在HandleExceptionAsync中处理
+                await HandleExceptionAsync(httpContext, ex, db); // 捕获异常了 在HandleExceptionAsync中处理
             }
         }
 
@@ -41,16 +43,27 @@
         /// </summary>
         /// <param name="context"></param>
         /// <param name="exception"></param>
+        /// <param name="db"></param>
         /// <returns></returns>
-        private async Task HandleExceptionAsync(HttpContext context, Exception exception)
+        private async Task HandleExceptionAsync(HttpContext context, Exception exception, ISqlSugarClient db)
         {
+            //验证异常是否存在异常处理，存在则回滚事务
+            if (db != null && db.Ado.Transaction != null)
+            {
+                db.Ado.RollbackTran();
+            }
+
+
             context.Response.ContentType = "application/json";  // 返回json 类型
             var response = context.Response;
             var errorResponse = new JsonView
             {
                 Code = StatusCodes.Status500InternalServerError,
                 Data = ""
-            };  // 自定义的异常错误信息类型
+            };  
+            
+            
+            // 自定义的异常错误信息类型
             switch (exception)
             {
                 case ApplicationException ex:

OASystem/OASystem.Api/Program.cs

@@ -392,7 +392,6 @@ builder.Services.TryAddSingleton(typeof(CommonService));
 
 var app = builder.Build();
 
-
 AutofacIocManager.Instance.Container = app.UseHostFiltering().ApplicationServices.GetAutofacRoot();//AutofacIocManager
 
 // Configure the HTTP request pipeline.

OASystem/OASystem.Domain/Dtos/PersonnelModule/GoodsDTO.cs

@@ -92,11 +92,24 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     /// </summary>
     public class GoodsStorageListDto : DtoBase
     {
+        public int CurrUserId { get; set; }
+
         /// <summary>
         /// 物品Id
         /// </summary>
         public int GoodsId { get; set; }
 
+        /// <summary>
+        /// 入库/出库审核状态Ids
+        /// 多个eg："1,2,3,4"
+        /// </summary>
+        public string AuditLabel { get; set; }
+
+        /// <summary>
+        /// 物品Name(入库审核List搜索条件)
+        /// </summary>
+        public string GoodsName { get; set; }
+
         /// <summary>
         /// 入库批次号
         /// </summary>
@@ -173,6 +186,29 @@ namespace OASystem.Domain.Dtos.PersonnelModule
 
     }
 
+    public class GoodsStorageConfirmDto
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 审核部门
+        /// 1：人事部
+        /// 2：财务部
+        /// </summary>
+        public GoodsAuditDepEnum AuditDep { get; set; }
+
+        /// <summary>
+        /// 入库确认状态
+        /// 0：待确认
+        /// 1：部分确认
+        /// 2：已确认
+        /// 3：已拒绝
+        /// 注：可用状态(已确认、已拒绝)
+        /// </summary>
+        public GoodsConfirmEnum ConfirmStatus { get; set; }
+
+    }
+
     /// <summary>
     /// 物品入库 操作(Create Or Edit) 
     /// Validator
@@ -248,6 +284,8 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// 是否导出Excel
         /// </summary>
         public bool IsExcelDownload { get; set; } = false;
+
+        public int CurrUserId { get; set; }
     }
 
     /// <summary>
@@ -319,7 +357,7 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         public string Label { get; set; }
 
         /// <summary>
-        /// 审核状态
+        /// 审核状态 可用状态 0：取消领用确认、取消领用拒绝 1：领用确认 2：领用拒绝 3：取消出库确认、取消出库拒绝 5：出库确认 6：出库拒绝
         /// </summary>
         public GoodsAuditEnum AuditEnum { get; set; }
     }

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_GoodsAudit.cs

@@ -0,0 +1,99 @@
+using OASystem.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.PersonnelModule
+{
+    /// <summary>
+    /// 物品确认审核表
+    /// </summary>
+    [SugarTable(tableName: "Pm_GoodsAudit", tableDescription: "物品确认审核表")]
+    public class Pm_GoodsAudit : EntityBase
+    {
+        /// <summary>
+        /// 审核类型
+        /// 1.入库 2.出库 
+        /// </summary>
+        [SugarColumn(ColumnDescription = "审核类型", IsNullable = true, ColumnDataType = "int")]
+        public int Type { get; set; } = 1;
+
+        /// <summary>
+        /// 审核部门
+        /// </summary>
+        [SugarColumn(ColumnDescription = "审核部门", IsNullable = true, ColumnDataType = "bit")]
+        public GoodsAuditDepEnum Dep { get; set; }
+
+        /// <summary>
+        /// DataId 
+        /// </summary>
+        [SugarColumn(ColumnDescription = "DataId", IsNullable = true, ColumnDataType = "int")]
+        public int DataId { get; set; } = 0;
+
+        /// <summary>
+        /// 确认状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "审核状态", IsNullable = true, ColumnDataType = "bit")]
+        public GoodsConfirmEnum AuditStatus { get; set; } = GoodsConfirmEnum.WaitConfirm;
+
+        /// <summary>
+        /// 审核人 Id
+        /// Sys_User Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "审核人Id", IsNullable = true, ColumnDataType = "int")]
+        public int AuditUserId { get; set; }
+
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "审核时间", IsNullable = true, ColumnDataType = "datetime")]
+        public DateTime AuditTime { get; set; }
+
+        public Pm_GoodsAudit(){}
+
+        /// <summary>
+        /// 基础数据初始化
+        /// </summary>
+        /// <param name="type">
+        /// 审核类型
+        /// 1.入库 2.出库 
+        /// </param>
+        /// <param name="dep">审核部门</param>
+        /// <param name="dataId">DataId</param>
+        /// <param name="auditStatus">确认状态</param>
+        /// <param name="currUserId">创建人</param>
+        public Pm_GoodsAudit(int type, GoodsAuditDepEnum dep, int dataId, GoodsConfirmEnum auditStatus,int currUserId)
+        {
+            this.Type = type;
+            this.Dep = dep;
+            this.DataId = dataId;
+            this.AuditStatus = auditStatus;
+            this.AuditTime = DateTime.Now;
+            this.CreateUserId = currUserId;
+        }
+        /// <summary>
+        /// 基础数据初始化
+        /// </summary>
+        /// <param name="type">
+        /// 审核类型
+        /// 1.入库 2.出库 
+        /// </param>
+        /// <param name="dep">审核部门</param>
+        /// <param name="dataId">DataId</param>
+        /// <param name="auditStatus">确认状态</param>
+        /// <param name="auditorId">审核人</param>
+        /// <param name="currUserId">创建人</param>
+        public Pm_GoodsAudit(int type, GoodsAuditDepEnum dep, int dataId, GoodsConfirmEnum auditStatus, int auditorId, int currUserId)
+        {
+            this.Type = type;
+            this.Dep = dep;
+            this.DataId = dataId;
+            this.AuditStatus = auditStatus;
+            this.AuditUserId = currUserId;
+            this.AuditTime = DateTime.Now;
+            this.CreateUserId = currUserId;
+        }
+    }
+}

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

@@ -65,5 +65,12 @@ namespace OASystem.Domain.Entities.PersonnelModule
         /// </summary>
         [SugarColumn(ColumnDescription = "审核时间", IsNullable = true, ColumnDataType = "datetime")]
         public DateTime AuditTime { get; set; }
+
+        /// <summary>
+        /// 领用/出库确认 状态描述
+        /// </summary>
+        [SugarColumn(ColumnDescription = "领用/出库确认 状态描述", IsNullable = true, ColumnDataType = "varchar(255)")]
+        public string StatusDesc { get; set; } = string.Format("领用确认：状态:待确认  审核人:-  审核时间:-;<br/>人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
+
     }
 }

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

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -85,5 +86,17 @@ namespace OASystem.Domain.Entities.PersonnelModule
         [SugarColumn(ColumnDescription = "入库时间", IsNullable = true, ColumnDataType = "varchar(30)")]
         public string? StorageTime { get; set; }
 
+        /// <summary>
+        /// 入库确认状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入库确认", IsNullable = true, ColumnDataType = "int")]
+        public GoodsConfirmEnum ConfirmStatus { get; set; } = GoodsConfirmEnum.WaitConfirm;
+
+        /// <summary>
+        /// 入库确认描述
+        /// </summary>
+        [SugarColumn(ColumnDescription = "入库确认描述", IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string StatusDesc { get; set; } = string.Format("人事部：状态:待确认  审核人:-  审核时间:-;<br/>财务部：状态:待确认  审核人:-  审核时间:-;");
+
     }
 }

OASystem/OASystem.Domain/Enums/GoodsAuditEnum.cs

@@ -12,20 +12,90 @@ namespace OASystem.Domain.Enums
     /// </summary>
     public enum GoodsAuditEnum :int
     {
+        /*
+         * 审核流程 1 领用待确认 2 领用已确认 3 领用确认已拒绝 4 出库待确认 5 出库确认中 6 出库确认完成 7 出库确认拒绝
+         * 
+         */
+
         /// <summary>
-        /// 待审核
+        /// 领用待确认
         /// </summary>
-        [Description("待审核")]
+        [Description("领用待确认")]
         Pending,
         /// <summary>
-        /// 已通过审核
+        /// 领用已确认
         /// </summary>
-        [Description("已通过")]
+        [Description("已确认领用")]
         Approved,
         /// <summary>
-        /// 已拒绝审核
+        /// 领用确认已拒绝
+        /// </summary>
+        [Description("已拒绝领用")]
+        UnApproved,
+        /// <summary>
+        /// 出库待确认
+        /// </summary>
+        [Description("出库待确认")]
+        OutPending,
+        /// <summary>
+        /// 出库确认中
+        /// </summary>
+        [Description("出库确认中")]
+        OutConfirming,
+        /// <summary>
+        /// 出库确认完成
+        /// </summary>
+        [Description("已完成出库")]
+        OutConfirmed,
+        /// <summary>
+        /// 出库确认拒绝
+        /// </summary>
+        [Description("已拒绝出库")]
+        OutRejected,
+    }
+
+    /// <summary>
+    /// 出库入库状态
+    /// </summary>
+    public enum GoodsConfirmEnum : int
+    {
+        /// <summary>
+        /// 待确认    
         /// </summary>
-        [Description("未通过")]
-        UnApproved
+        [Description("待确认")]
+        WaitConfirm,
+        /// <summary>
+        /// 确认中
+        /// </summary>
+        [Description("确认中")]
+        PartConfirmed,
+        /// <summary>
+        /// 已确认
+        /// </summary>
+        [Description("已确认")]
+        Confirmed,
+        /// <summary>
+        /// 已拒绝
+        /// </summary>
+        [Description("已拒绝")]
+        UnApproved,
+    }
+
+    /// <summary>
+    /// 出库入库 审核部门
+    /// </summary>
+    public enum GoodsAuditDepEnum : int
+    {
+        /// <summary>
+        /// 人事部
+        /// </summary>
+        [Description("人事部")]
+        Hr = 1,
+        /// <summary>
+        /// 财务部
+        /// </summary>
+        [Description("财务部")]
+        Financial
     }
+
 }

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

@@ -181,7 +181,6 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
 
     public class GoodsReceiveView
     {
-
         public int Id { get; set; }
         public int GroupId { get; set; }
         public int GoodsId { get; set; }
@@ -192,6 +191,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         public string Remark { get; set; }
         public GoodsAuditEnum AuditStatus { get; set; }
         public string AuditStatusText { get { return AuditStatus.GetEnumDescription(); } }
+        public string StatusDesc { get; set; }
         public int AuditUserId { get; set; }
         public string AuditUserName { get; set; }
         public DateTime AuditTime { get; set; }
@@ -204,6 +204,7 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
     public class GoodsReceiveListView: GoodsReceiveView
     {
         public string GoodsType { get; set; }
+        public GoodsStorageAuditPerView[] AuditPers { get; set; }
     }
 
     public class GoodsReceiveListMobileView : GoodsReceiveListView
@@ -258,4 +259,54 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         public decimal StockQuantity { get; set; }
         public string Unit { get; set; }
     }
+
+    public class GoodsStorageListView
+    {
+        public int Id { get; set; }
+        public int GoodsId { get; set; }
+        public string GoodsName { get; set; }
+        public string BatchNo { get; set; }
+        public decimal Quantity { get; set; }
+        public decimal UnitPrice { get; set; }
+        public decimal TotalPrice { get; set; }
+        public string SupplierName { get; set; }
+        public string SupplierTel { get; set; }
+        public string SupplierAddress { get; set; }
+        public string SupplierSource { get; set; }
+        public string StorageUserName { get; set; }
+        public string StorageTime { get; set; }
+        public string CreateUserName { get; set; }
+        public GoodsConfirmEnum ConfirmStatus { get; set; }
+        public string ConfirmStatusText
+        {
+            get
+            {
+                return ConfirmStatus.GetEnumDescription();
+            }
+        }
+        public string StatusDesc { get; set; }
+        public DateTime CreateTime { get; set; }
+
+        public string Remark { get; set; }
+
+        public GoodsStorageAuditPerView[] AuditPers { get; set; }
+
+    }
+
+    public class GoodsStorageAuditPerView
+    {
+        public bool AuditPer { get; set; }
+        public GoodsAuditDepEnum AuditDep { get; set; }
+
+        public string ButtonText { get; set; }
+    }
+
+    #region 审核部门View
+    public class GoodsAuditDepView
+    {
+        public GoodsAuditDepEnum AuditDep { get; set; }
+
+        public int[] AuditorIds { get; set; }
+    }
+    #endregion
 }