团组流程管控新增-收款完成

OASystem/OASystem.Api/OAMethodLib/GroupStepForDelegation.cs

@@ -217,13 +217,20 @@ namespace OASystem.API.OAMethodLibs
                     grp_busOP603.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
                     grp_busOP603.SLevel = 2;
                     entityList.Add(grp_busOP603);
-                    //OP-OP费用录入
+                    //OP-OP询价
                     Grp_ScheduleDetailInfo grp_busOP6032 = _model.DeepClone();
                     grp_busOP6032.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessOPChild02);
                     grp_busOP6032.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
                     grp_busOP6032.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOPChild02;
                     grp_busOP6032.SLevel = 3;
                     entityList.Add(grp_busOP6032);
+                    //OP-OP费用录入
+                    Grp_ScheduleDetailInfo grp_busOP6033 = _model.DeepClone();
+                    grp_busOP6033.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessOPChild03);
+                    grp_busOP6033.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessOP;
+                    grp_busOP6033.Step = (int)GrpSchedulePrimaryStepEnum.BusinessOPChild03;
+                    grp_busOP6033.SLevel = 3;
+                    entityList.Add(grp_busOP6032);
 
                     //商邀
                     Grp_ScheduleDetailInfo grp_busSY604 = _model.DeepClone();
@@ -232,28 +239,21 @@ namespace OASystem.API.OAMethodLibs
                     grp_busSY604.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
                     grp_busSY604.SLevel = 2;
                     entityList.Add(grp_busSY604);
-                    //商邀-商邀费用录入
+                    //商邀-商邀报批
                     Grp_ScheduleDetailInfo grp_busSY6042 = _model.DeepClone();
                     grp_busSY6042.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessSYChild02);
                     grp_busSY6042.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
                     grp_busSY6042.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSYChild02;
                     grp_busSY6042.SLevel = 3;
                     entityList.Add(grp_busSY6042);
-
-                    //其他
-                    Grp_ScheduleDetailInfo grp_busQT605 = _model.DeepClone();
-                    grp_busQT605.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessQT);
-                    grp_busQT605.ParentStep = (int)GrpSchedulePrimaryStepEnum.Business;
-                    grp_busQT605.Step = (int)GrpSchedulePrimaryStepEnum.BusinessQT;
-                    grp_busQT605.SLevel = 2;
-                    entityList.Add(grp_busQT605);
                     //商邀-商邀费用录入
-                    Grp_ScheduleDetailInfo grp_busQT6052 = _model.DeepClone();
-                    grp_busQT6052.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessQTChild02);
-                    grp_busQT6052.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessQT;
-                    grp_busQT6052.Step = (int)GrpSchedulePrimaryStepEnum.BusinessQTChild02;
-                    grp_busQT6052.SLevel = 3;
-                    entityList.Add(grp_busQT6052);
+                    Grp_ScheduleDetailInfo grp_busSY6043 = _model.DeepClone();
+                    grp_busSY6043.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.BusinessSYChild03);
+                    grp_busSY6043.ParentStep = (int)GrpSchedulePrimaryStepEnum.BusinessSY;
+                    grp_busSY6043.Step = (int)GrpSchedulePrimaryStepEnum.BusinessSYChild03;
+                    grp_busSY6043.SLevel = 3;
+                    entityList.Add(grp_busSY6043);
+
 
                     #endregion
                     #region 费用审批
@@ -330,8 +330,16 @@ namespace OASystem.API.OAMethodLibs
                     #region （目前为空）接机
 
                     #endregion
-                    #region （目前为空）收款
-
+                    #region 收款
+                    //收款完成
+                    Grp_ScheduleDetailInfo grp_col01 = _model.DeepClone();
+                    grp_col01.JobContent = EnumHelper.GetEnumDescription(GrpSchedulePrimaryStepEnum.CollectChild01);
+                    grp_col01.ParentStep = (int)GrpSchedulePrimaryStepEnum.Collect;
+                    grp_col01.Step = (int)GrpSchedulePrimaryStepEnum.CollectChild01;
+                    grp_col01.ExpectBeginDt = dftEndDt;
+                    grp_col01.ExpectEndDt = dftEndDt.AddMonths(3);
+                    grp_col01.SLevel = 2;
+                    entityList.Add(grp_col01);
                     #endregion
                     #region （目前为空）团组完成
 

OASystem/OASystem.Domain/Enums/GrpScheduleEnum.cs

@@ -192,10 +192,15 @@ namespace OASystem.Domain.Enums
         [Description("业务流程-OP-自定义子流程")]
         BusinessOPChild01 = 6031,
         /// <summary>
+        /// 业务流程-OP-OP询价 III
+        /// </summary>
+        [Description("OP询价")]
+        BusinessOPChild02 = 6032,
+        /// <summary>
         /// 业务流程-OP-OP费用录入 III
         /// </summary>
         [Description("OP费用录入")]
-        BusinessOPChild02 = 6032,
+        BusinessOPChild03 = 6033,
         #endregion
         #region 商邀
         /// <summary>
@@ -209,10 +214,15 @@ namespace OASystem.Domain.Enums
         [Description("业务流程-商邀-自定义子流程")]
         BusinessSYChild01 = 6041,
         /// <summary>
+        /// 业务流程-商邀-商邀报批 III
+        /// </summary>
+        [Description("商邀报批")]
+        BusinessSYChild02 = 6042,
+        /// <summary>
         /// 业务流程-商邀-商邀费用录入 III
         /// </summary>
         [Description("报批/商邀费用录入")]
-        BusinessSYChild02 = 6042,
+        BusinessSYChild03 = 6043,
         #endregion
         #region 其他
         /// <summary>
@@ -225,11 +235,6 @@ namespace OASystem.Domain.Enums
         /// </summary>
         [Description("业务流程-其他-自定义子流程")]
         BusinessQTChild01 = 6051,
-        /// <summary>
-        /// 业务流程-商邀-商邀费用录入 III
-        /// </summary>
-        [Description("增减款项录入")]
-        BusinessQTChild02 = 6052,
         #endregion
 
         #endregion
@@ -319,11 +324,19 @@ namespace OASystem.Domain.Enums
         [Description("接机")]
         PickUp = 11,
 
+        #region 已收款项
+
         /// <summary>
         /// 收款 I
         /// </summary>
         [Description("收款")]
         Collect = 12,
+        /// <summary>
+        /// 收款 I
+        /// </summary>
+        [Description("收款完成")]
+        CollectChild01 = 1201,
+        #endregion
 
         /// <summary>
         /// 团组完成 I