新增結算,運營辦相關

WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs

@@ -349,9 +349,11 @@ namespace WebAPI.Controllers
                             case "CF":
                                 IsConfirm = 1; return_msg = "確認完成"; break;
                             case "RV":
-                                IsConfirm = 0; return_msg = "已撤回"; break;
+                                IsConfirm = 0; return_msg = ""; break;
                             case "RJ":
                                 IsConfirm = 0; return_msg = "已退回"; break;
+                            case "RJOp":
+                                IsConfirm = 0; return_msg = "已退至運營辦"; break;
                             default:
                                 IsConfirm = 0; return_msg = "已退回"; break;
                         }
@@ -394,10 +396,11 @@ namespace WebAPI.Controllers
                         #endregion
                         //Confirm_Class.Add("PG"); Confirm_Class.Add("Leader"); //test 
                         #region 取得FLOW相關
-                        cmd.CommandText = @"select　et.*,etf.id AS Flowid,etf.*,
+                        cmd.CommandText = @"select　et.*,etf.id AS Flowid,etf.*,eeas.cn_name as ascn_name,
                             etfs.* FROM esn_todos et 
                             left join esn_todos_Flow etf on et.sn=etf.esn_todos_sn
                             left join esn_todos_Flow_StepType etfs on etfs.id=etf.StepType_id   
+							left join evw_Employee eeas on eeas.user_id=et.AssignedTo
                                                         where et.sn in(@Esn_Todos_Sn)
 
                           ";
@@ -415,13 +418,14 @@ namespace WebAPI.Controllers
                         #endregion
 
                         String Wade_User_ID = obj_input["Wade_User_ID"].ToString(), Reject_Description = obj_input["Reject_Description"].ToString(),
-                            date0 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Tsql = "";
+                            date0 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Tsql = "",RJOp="";
 
                         JToken JtSn;
                         //List<String> sql = new List<string>();
                         int StepType_id_Previous, StepType_id, StepType_idHis;
                         foreach (DataRow dr in ds.Tables[0].Rows)
                         {
+                            RJOp = "";
                             StepType_id_Previous = dr["StepType_id_Previous"] == DBNull.Value ? 0 : Convert.ToInt32(dr["StepType_id_Previous"]);
                             //StepType_id_next = Convert.ToInt32(dr["StepType_id_next"]);
                             StepType_id = dr["StepType_id"] == DBNull.Value ? 0 : Convert.ToInt32(dr["StepType_id"]);
@@ -438,7 +442,7 @@ namespace WebAPI.Controllers
                                      + @"_IsConfirm],StepType_id_Previous,Description,[create_user_id],[Create_time],update_user_id,update_time) "
                                      + " OUTPUT Inserted.id into @TempTable "
                                      + " values (" + dr["sn"] + ",'" + CStepTypeNext.id + "'," + IsConfirm + ",'" + 1
-                                     + "','" + Reject_Description + "','" + Wade_User_ID + "'" + ",'" + date0 + "'" + ",'" + Wade_User_ID + "'" + ",'" + date0 + "'" + "); "
+                                     + "',@Reject_Description,@Wade_User_ID,'" + date0 + "'" + ",@Wade_User_ID,'" + date0 + "'" + "); "
                                      ;
                             }
                             else //update
@@ -482,22 +486,33 @@ namespace WebAPI.Controllers
                                     CStepTypeCur.id = CStepTypeNext.id; //回復與下一步 同ID
                                     Tsql = Tsql + CStepTypeNext.Map_Class + "_IsConfirm =" + IsConfirm + ",";
                                 }
+                                else if (Confirm_Method == "RJOp")
+                                {
+                                    Tsql = Tsql + "PG_IsConfirm =" + IsConfirm + "," + "PE_IsConfirm =" + IsConfirm + "," + "Leader_IsConfirm =" + IsConfirm + ","; //退回後,改為更新所有Flow狀態確認
+                                    CStepTypeNext = AllStepType.Where(p => p.Step_Value == Step_Value_previous).FirstOrDefault();
+                                    StepType_idHis = CStepTypeCur.id;
+                                    RJOp= @"update esn_Todos set AssignStatus = 'AS01', AssignStatus_name = '運營辦指派' where sn = " + dr["sn"] + @";
+                                      insert into esn_OthData(oth_ID, FldName, FldValue, FldMemo, FldMemo2, oth_Status, updateUser, update_time)
+                                      select " + dr["sn"] + ",'SuggestPoints'," + dr["Points"] + ",@Reject_Description,'','I',@ascn_name,GETDATE()";
+                                    cmd.Parameters.AddWithValue("@ascn_name", dr["ascn_name"]);
+                                }
                                 else
                                 {
                                     Tsql = Tsql + CStepTypeCur.Map_Class + "_IsConfirm =" + IsConfirm + ",";
                                     StepType_idHis = CStepTypeCur.id;
                                 }
                                 Tsql = Tsql + " StepType_id = '" + CStepTypeNext.id + "',StepType_id_Previous = '" + CStepTypeCur.id +
-                                    "',Description = '" + Reject_Description + "',update_user_id='" + Wade_User_ID + "',update_time='" + date0 + "' "
+                                    "',Description = @Reject_Description,update_user_id=@Wade_User_ID,update_time='" + date0 + "' "
                                     + " output Inserted.id  into @TempTable where id =" + dr["Flowid"] + ";"
                                     ;
                             }
 
-                            Tsql = Tsql + "select @FlowId=id from @TempTable;";
-                            Tsql = Tsql + "insert into esn_todos_Flow_his  (Flow_id,ConfirmTime,FromType_id,ToType_id,ConfirmUserId,ConfirmUserClass,ConfirmMethod,Description,Create_User_id,Create_time) "
-                                + " values (@FlowId,'" + date0 + "','" + StepType_idHis + "','" + CStepTypeNext.id + "','" + Wade_User_ID
-                                + "','" + CStepTypeCur.Map_Class + "','" + Confirm_Method + "','" + Reject_Description + "','" + Wade_User_ID + "','" + date0 + "'" + ") ;";
-
+                            Tsql += @"select @FlowId=id from @TempTable;
+                                    insert into esn_todos_Flow_his  (Flow_id,ConfirmTime,FromType_id,ToType_id,ConfirmUserId,ConfirmUserClass,ConfirmMethod,Description,Create_User_id,Create_time) "
+                                    + " values (@FlowId,'" + date0 + "','" + StepType_idHis + "','" + CStepTypeNext.id + "',@Wade_User_ID,'" + CStepTypeCur.Map_Class + "','" + Confirm_Method + "',@Reject_Description,@Wade_User_ID,'" + date0 + "'" + ") ;";
+                            Tsql += RJOp;
+                           cmd.Parameters.AddWithValue("@Reject_Description", Reject_Description);
+                            cmd.Parameters.AddWithValue("@Wade_User_ID", Wade_User_ID);
                         }
 
                         cmd.CommandText = @"declare  @TempTable TABLE(id INT)