feat:不可結算步驟 加入 運營辦審核,管理中心審核,跨月審核

WebAPI/Controllers/Esn_Subitem/Esn_todosController.cs

@@ -144,7 +144,7 @@ namespace WebAPI.Controllers
                     {
 
                         String sns = obj_input["SN"].ToString();
-                        String sqlstr = @"select td.SN, tdp.SN as SN_tdp,td.points,AssignedTo_userid,tdp.date_points_settlement,td.TaskDescription,etfs.Map_Class,td.CaseNo ,eel.*   FROM esn_todos td 
+                        String sqlstr = @"select td.SN, tdp.SN as SN_tdp,td.points,AssignedTo_userid,tdp.date_points_settlement,td.TaskDescription,etfs.Map_Class,td.CaseNo,etfs.Step_Text ,eel.*   FROM esn_todos td 
                                           left join esn_todos_points tdp on tdp.sn=td.sn
                                           left join evw_Employee eel on eel.user_id=td.AssignedTo_userid
                                           left join esn_todos_Flow etf on etf.esn_todos_sn=td.sn
@@ -217,9 +217,9 @@ namespace WebAPI.Controllers
                                 }
                             #endregion
                             #region 程序不可結算
-                                if (Map_Class == "PG")
+                            if (Map_Class == "PG" || Map_Class == "RJTOp" || Map_Class == "AMTCC" || Map_Class == "AMTOp")
                             {
-                                    return_msg_error.Add(etsmmsg +" 程序審核中,不可結算<br>");
+                                return_msg_error.Add(etsmmsg + "在 " +dr["Step_Text"].ToString() + " 步驟,不可結算<br>");
                                 continue;
                             }
                             #endregion
@@ -275,7 +275,7 @@ namespace WebAPI.Controllers
                             foreach (string sql in batchSql)
                             {
                                 cmd.CommandText = sql;
-                                dt = SqlToDt(cmd);
+                                //dt = SqlToDt(cmd);
                             }
                             return_msgs.Add("設定結算完畢");