教育耗材出库功能

Property.Model/Entity/Property/RB_Property_BuyingRequisition.cs

@@ -47,7 +47,7 @@ namespace Property.Model.Entity
             set;
         }
         /// <summary>
-        /// 购买状态   1已购买  2购买中  3驳回  4待处理
+        /// 购买状态  看枚举
         /// </summary>        
         public BuyingRequisitionStatusEnum? BuyStatus
         {

Property.Model/Entity/Supplies/RB_Supplies_StockOut.cs

@@ -131,5 +131,10 @@ namespace Property.Model.Entity
         /// 出库公司
         /// </summary>
         public int? BranchId { get; set; }
+
+        /// <summary>
+        /// 耗材出库申请id
+        /// </summary>
+        public int ApplyForId { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Entity/Supplies/RB_Supplies_StockOutApplyFor.cs

+using System;
+using REBORN.Common.AOP;
+using REBORN.Common.Plugin;
+
+namespace Property.Model.Entity
+{
+
+    /// <summary>
+    /// 耗材出库申请实体
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Supplies_StockOutApplyFor
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 总数量
+        /// </summary>
+        public int TotalNumber { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 状态 0 正常 1删除
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>
+        public int RB_Branch_Id { get; set; }
+
+        /// <summary>
+        /// 集团
+        /// </summary>
+        public int RB_Group_Id { get; set; }
+
+        /// <summary>
+        /// CreateBy
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// UpdateBy
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// UpdateDate
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 关联财务单据id（英文逗号分隔）
+        /// </summary>
+        public string FinanceIds { get; set; }
+
+        /// <summary>
+        /// 出库状态   1未出库  2部分出库  3已出库
+        /// </summary>
+        public int StockOutStatus { get; set; }
+
+        /// <summary>
+        /// 审核状态  1审核中   2通过   3驳回
+        /// </summary>
+        public int AuditStatus { get; set; }
+
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        public string AuditRemark { get; set; }
+
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public int AuditEmpId { get; set; }
+
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        public DateTime? AuditDate { get; set; }
+
+    }
+}
\ No newline at end of file

Property.Model/Entity/Supplies/RB_Supplies_StockOutApplyForDetail.cs

+using System;
+using REBORN.Common.AOP;
+using REBORN.Common.Plugin;
+
+namespace Property.Model.Entity
+{
+
+    /// <summary>
+    /// 耗材出库申请明细实体
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Supplies_StockOutApplyForDetail
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 申请id
+        /// </summary>
+        public int ApplyForId { get; set; }
+
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 耗材id
+        /// </summary>
+        public int SuppliesId { get; set; }
+
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+        public int Number { get; set; }
+
+        /// <summary>
+        /// 已出库数量
+        /// </summary>
+        public int StockOutNum { get; set; }
+
+        /// <summary>
+        /// 状态 0 正常 1删除
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>
+        public int RB_Branch_Id { get; set; }
+
+        /// <summary>
+        /// 集团
+        /// </summary>
+        public int RB_Group_Id { get; set; }
+
+        /// <summary>
+        /// CreateBy
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// CreateDate
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// UpdateBy
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// UpdateDate
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int SchoolId { get; set; }
+
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+    }
+}
\ No newline at end of file

Property.Model/Entity/User/RB_Finance_Config.cs

@@ -70,5 +70,10 @@ namespace Property.Model.Entity
         /// 币种id
         /// </summary>
         public int CurrencyId { get; set; }
+
+        /// <summary>
+        /// 付款对象id (出库时使用)
+        /// </summary>
+        public int ClientID { get; set; }
     }
 }

Property.Model/Extend/Supplies/RB_Supplies_StockOutApplyForDetail_Extend.cs

+using System;
+using System.Collections.Generic;
+using Property.Model.Entity;
+using REBORN.Common.AOP;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 耗材出库申请明细扩展实体
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Supplies_StockOutApplyForDetail_Extend : RB_Supplies_StockOutApplyForDetail
+    {
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string SuppliesName { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string SuppliesNum { get; set; }
+
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string CategoryName { get; set; }
+
+        /// <summary>
+        /// 待出库数量
+        /// </summary>
+        public int WaitStockOutNum { get; set; }
+
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        public string BrandName { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string Units { get; set; }
+
+        /// <summary>
+        /// 申请ids
+        /// </summary>
+        public string ApplyForIds { get; set; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Money { get; set; }
+    }
+}
\ No newline at end of file

Property.Model/Extend/Supplies/RB_Supplies_StockOutApplyFor_Extend.cs

+using System;
+using System.Collections.Generic;
+using Property.Model.Entity;
+using REBORN.Common.AOP;
+
+namespace Property.Model.Extend
+{
+    /// <summary>
+    /// 耗材出库申请扩展实体
+    /// </summary>    
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_Supplies_StockOutApplyFor_Extend : RB_Supplies_StockOutApplyFor
+    {
+        /// <summary>
+        /// 明细列表
+        /// </summary>
+        public List<RB_Supplies_StockOutApplyForDetail_Extend> DetailList { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string SuppliesName { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 仓库id
+        /// </summary>
+        public int WareHouseId { get; set; }
+    }
+}
\ No newline at end of file

Property.Modele.FixedAssets/PropertyModule.cs

@@ -4098,7 +4098,7 @@ namespace Property.Module.FixedAssets
                 blist = schoolRepository.GetSchoolListRepository(new RB_School_ViewModel() { QSIds = bstr });
 
                 //获取流程相关信息
-                List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id);
+                List<Rb_Workflow_AuditRelevance_Extend> warlist = workflow_AuditRelevanceRepository.GetAuditRelevanceList(dmodel.Id, "", null, 2);
                 List<Rb_Workflow_Auditrecord_Extend> walist = new List<Rb_Workflow_Auditrecord_Extend>();
                 walist = workflow_AuditrecordRepository.GetFinaceAuditRecordList(new Rb_Workflow_Auditrecord_Extend() { WorkFlowId = dmodel.Id, TemplateType = 2 });
 
@@ -4524,7 +4524,13 @@ namespace Property.Module.FixedAssets
                     Remark = DateTime.Now.ToString("yyyy年MM月dd日") + "生成财务单据",
                     detailList,
                     RB_Depart_Id = userInfo.RB_Department_Id,
-                    ReFinanceId = ProcurementId
+                    ReFinanceId = ProcurementId,
+                    FinanceType = 2,
+                    RB_Group_Id = userInfo.RB_Group_id,
+                    RB_CreateByName = userInfo.emName,
+                    RB_DepartName = userInfo.DepartName,
+                    RB_BranchName = schoolRepository.GetEntity(demodel.SchoolId)?.SName ?? "",
+                    RB_GroupName = userInfo.GroupName
                 };
                 string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
                 var resultInfo = new

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -3965,7 +3965,7 @@ namespace Property.Module.FixedAssets
                             {
                                 ApplyForList = new List<int>() { usemodel.CreateBy ?? 0 };
                             }
-                            var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 0);
+                            var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 2);
                             if (flag == false)
                             {
                                 workflow_AuditRelevanceRepository.DBSession.Rollback();
@@ -4109,7 +4109,7 @@ namespace Property.Module.FixedAssets
                         {
                             ApplyForList = new List<int>() { usemodel.CreateBy ?? 0 };
                         }
-                        var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 0);
+                        var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 2);
                         if (flag == false)
                         {
                             workflow_AuditRelevanceRepository.DBSession.Rollback();
@@ -4196,7 +4196,7 @@ namespace Property.Module.FixedAssets
                         {
                             ApplyForList = new List<int>() { usemodel.CreateBy ?? 0 };
                         }
-                        var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 0);
+                        var flag = InsertAuditRelevanceNext(tempModel, modelNext, usemodel.CreateBy ?? 0, userInfo.EmployeeId, usemodel.Id, ApplyForList, trans, out AuditAccountList, 2);
                         if (flag == false)
                         {
                             workflow_AuditRelevanceRepository.DBSession.Rollback("Audit审核失败22，单号：" + WorkFlowId);

Property.Repository/Property/RB_Property_BuyingRequisitionRepository.cs

@@ -124,7 +124,7 @@ left join rb_property_category pc on pb.CategoryId = pc.Id
             {
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.BuyStatus) + "=" + (int)dmodel.BuyStatus;
             }
-            if (dmodel.SchoolId > 0)
+            if (dmodel.SchoolId >= 0)
             {
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.SchoolId) + "=" + dmodel.SchoolId;
             }
@@ -147,6 +147,7 @@ left join rb_property_category pc on pb.CategoryId = pc.Id
             if (dmodel.IsWaitDeal == 1)
             {
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.ManagersId) + "=" + dmodel.ManagersId;
+                where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.BuyStatus) + "=" + (int)BuyingRequisitionStatusEnum.Purchased;
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.ProcurementId) + "=0";
             }
             if (dmodel.AuditEmId > 0)
@@ -155,14 +156,14 @@ left join rb_property_category pc on pb.CategoryId = pc.Id
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditStatus) + "=" + (int)WFRrocessStatus.NotAudit;
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.BuyStatus) + "=" + (int)BuyingRequisitionStatusEnum.Pending;//需要申请单在审核中
                 where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.SpecialNode) + " !=" + (int)WFSpecialNodeEnum.Pay;//排除签名的
-                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =0";
+                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =2";
             }
             if (dmodel.AuditedEmId > 0)
             {
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditEmId) + "=" + dmodel.AuditedEmId;
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditStatus) + " in(" + (int)WFRrocessStatus.AuditThrough + "," + (int)WFRrocessStatus.AuditNotThrough + "," + (int)WFRrocessStatus.Rejected + ")";
                 where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.SpecialNode) + " !=" + (int)WFSpecialNodeEnum.Pay;//排除签名的
-                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =0";
+                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =2";
             }
             string sql = $@" select pu.*,pc.Name as CategoryName from 
 RB_Property_BuyingRequisition pu 
@@ -225,6 +226,7 @@ LEFT JOIN rb_workflow_auditrelevance war on wa.AuditId=war.Id
             if (dmodel.IsWaitDeal == 1)
             {
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.ManagersId) + "=" + dmodel.ManagersId;
+                where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.BuyStatus) + "=" + (int)BuyingRequisitionStatusEnum.Purchased;
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.ProcurementId) + "=0";
             }
             if (dmodel.AuditEmId > 0)
@@ -233,22 +235,23 @@ LEFT JOIN rb_workflow_auditrelevance war on wa.AuditId=war.Id
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditStatus) + "=" + (int)WFRrocessStatus.NotAudit;
                 where += " and pu." + nameof(RB_Property_BuyingRequisition_Extend.BuyStatus) + "=" + (int)BuyingRequisitionStatusEnum.Pending;//需要申请单在审核中
                 where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.SpecialNode) + " !=" + (int)WFSpecialNodeEnum.Pay;//排除签名的
-                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =0";
+                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =2";
             }
             if (dmodel.AuditedEmId > 0)
             {
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditEmId) + "=" + dmodel.AuditedEmId;
                 where += " and wa." + nameof(Rb_Workflow_Auditrecord.AuditStatus) + " in(" + (int)WFRrocessStatus.AuditThrough + "," + (int)WFRrocessStatus.AuditNotThrough + "," + (int)WFRrocessStatus.Rejected + ")";
                 where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.SpecialNode) + " !=" + (int)WFSpecialNodeEnum.Pay;//排除签名的
-                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =0";
+                where += " and war." + nameof(Rb_Workflow_AuditRelevance_Extend.TemplateType) + " =2";
             }
 
             string sql = $@"
-select count(pu.Id) as Number from 
+SELECT COUNT(0) as Number FROM(
+select pu.Id from 
 RB_Property_BuyingRequisition pu 
 left join rb_workflow_auditrecord wa on pu.Id=wa.WorkFlowId
 LEFT JOIN rb_workflow_auditrelevance war on wa.AuditId=war.Id
-{where} group by pu.Id";
+{where} group by pu.Id)t";
             return Get<RB_Property_UseReceive_Extend>(sql).FirstOrDefault()?.Number ?? 0;
         }
     }

Property.Repository/Supplies/RB_Supplies_MaterialRepository.cs

@@ -45,6 +45,10 @@ namespace Property.Repository
             if (dmodel.CategoryId > 0) {
                 where += " and sm." + nameof(RB_Supplies_Material_Extend.CategoryId) + "=" + dmodel.CategoryId;
             }
+            if (dmodel.FeeType > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_Material_Extend.FeeType) + "=" + dmodel.FeeType;
+            }
             
             string sql = $@" select sm.*,pc.Name as CategoryName from RB_Supplies_Material sm
 left join rb_property_category pc on sm.CategoryId=pc.Id

Property.Repository/Supplies/RB_Supplies_StockOutApplyForDetailRepository.cs

+using Property.Model.Entity;
+using Property.Model.Extend;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Dapper;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 耗材出库申请明细仓储类
+    /// </summary>
+    public partial class RB_Supplies_StockOutApplyForDetailRepository : RepositoryBase<RB_Supplies_StockOutApplyForDetail>
+    {
+        /// <summary>
+        /// 获取岗位分页数据
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="dmodel"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_StockOutApplyForDetail_Extend> GetPageList(int pageIndex, int pageSize, RB_Supplies_StockOutApplyForDetail_Extend dmodel, out long count)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Supplies_StockOutApplyForDetail_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.ApplyForId > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyForDetail_Extend.ApplyForId) + "=" + dmodel.ApplyForId;
+            }
+            if (!string.IsNullOrEmpty(dmodel.ApplyForIds))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyForDetail_Extend.ApplyForId) + " in(" + dmodel.ApplyForIds + ")";
+            }
+
+            string sql = $@" select pc.* from RB_Supplies_StockOutApplyForDetail pc
+{where} order by pc.Id desc";
+            return GetPage<RB_Supplies_StockOutApplyForDetail_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_StockOutApplyForDetail_Extend> GetList(RB_Supplies_StockOutApplyForDetail_Extend dmodel)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Supplies_StockOutApplyForDetail_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.ApplyForId > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyForDetail_Extend.ApplyForId) + "=" + dmodel.ApplyForId;
+            }
+            if (!string.IsNullOrEmpty(dmodel.ApplyForIds))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyForDetail_Extend.ApplyForId) + " in(" + dmodel.ApplyForIds + ")";
+            }
+
+            string sql = $@" select pc.*,m.Name as SuppliesName,m.SuppliesNum,m.BrandName,m.Units,c.Name as CategoryName from RB_Supplies_StockOutApplyForDetail pc
+left join rb_supplies_material m on m.Id = pc.SuppliesId
+left join rb_property_category c on c.Id = m.CategoryId
+{where} order by pc.Id desc";
+            return Get<RB_Supplies_StockOutApplyForDetail_Extend>(sql).ToList();
+        }
+    }
+}

Property.Repository/Supplies/RB_Supplies_StockOutApplyForRepository.cs

+using Property.Model.Entity;
+using Property.Model.Extend;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Dapper;
+
+namespace Property.Repository
+{
+    /// <summary>
+    /// 耗材出库申请仓储类
+    /// </summary>
+    public partial class RB_Supplies_StockOutApplyForRepository : RepositoryBase<RB_Supplies_StockOutApplyFor>
+    {
+        /// <summary>
+        /// 获取分页数据
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="dmodel"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_StockOutApplyFor_Extend> GetPageList(int pageIndex, int pageSize, RB_Supplies_StockOutApplyFor_Extend dmodel, out long count)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Supplies_StockOutApplyFor_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.AuditStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.AuditStatus) + "=" + dmodel.AuditStatus;
+            }
+            if (dmodel.StockOutStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.StockOutStatus) + "=" + dmodel.StockOutStatus;
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.CreateDate) + " >='" + dmodel.StartTime + "'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.CreateDate) + " <='" + dmodel.EndTime + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ClassName))
+            {
+                where += " and pc2.ClassName like @ClassName";
+                parms.Add("ClassName", "%" + dmodel.ClassName + "%");
+            }
+            if (!string.IsNullOrEmpty(dmodel.SuppliesName))
+            {
+                where += " and m.Name like @SuppliesName";
+                parms.Add("SuppliesName", "%" + dmodel.SuppliesName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Supplies_StockOutApplyFor pc
+left join rb_supplies_stockoutapplyfordetail pc2 on pc.Id=pc2.ApplyForId
+left join rb_supplies_material m on pc2.SuppliesId = m.Id
+{where} group by pc.Id order by pc.Id desc";
+            return GetPage<RB_Supplies_StockOutApplyFor_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_StockOutApplyFor_Extend> GetList(RB_Supplies_StockOutApplyFor_Extend dmodel)
+        {
+            DynamicParameters parms = new DynamicParameters();
+            string where = " where 1=1 ";
+            where += string.Format(" AND pc.{0}={1}", nameof(RB_Supplies_StockOutApplyFor_Extend.Status), 0);
+            where += $@" and pc.RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.AuditStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.AuditStatus) + "=" + dmodel.AuditStatus;
+            }
+            if (dmodel.StockOutStatus > 0)
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.StockOutStatus) + "=" + dmodel.StockOutStatus;
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.CreateDate) + " >='" + dmodel.StartTime + "'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += " and pc." + nameof(RB_Supplies_StockOutApplyFor_Extend.CreateDate) + " <='" + dmodel.EndTime + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.ClassName))
+            {
+                where += " and pc2.ClassName like @ClassName";
+                parms.Add("ClassName", "%" + dmodel.ClassName + "%");
+            }
+            if (!string.IsNullOrEmpty(dmodel.SuppliesName))
+            {
+                where += " and m.Name like @SuppliesName";
+                parms.Add("SuppliesName", "%" + dmodel.SuppliesName + "%");
+            }
+
+            string sql = $@" select pc.* from RB_Supplies_StockOutApplyFor pc
+left join rb_supplies_stockoutapplyfordetail pc2 on pc.Id=pc2.ApplyForId
+left join rb_supplies_material m on pc2.SuppliesId = m.Id
+{where} group by pc.Id order by pc.Id desc";
+            return Get<RB_Supplies_StockOutApplyFor_Extend>(sql).ToList();
+        }
+    }
+}