feat:發票抬頭 標準版 取消INSERT資料

feat:審核歷史新增運營辦流程LOG

WebAPI/Controllers/CustomerController.cs

@@ -168,9 +168,7 @@ namespace WebAPI.Controllers
                             CommandText = @"MERGE INTO essen_customer WITH(HOLDLOCK)  as target USING(
                             select @request_customer_id as request_customer_id, @customer_id as customer_id ) as source (request_id,customer_id)
                             on(target.customer_id = source.customer_id   )
-                            WHEN MATCHED THEN UPDATE SET request_customer_id = @request_customer_id 
-                            WHEN NOT MATCHED THEN INSERT(request_customer_id,customer_id) 
-                            VALUES(@request_customer_id,@customer_id );"
+                            WHEN MATCHED THEN UPDATE SET request_customer_id = @request_customer_id ;"
                         };
 
 

WebAPI/Controllers/Esn_Subitem/Esn_Todos_FlowController.cs

@@ -62,17 +62,8 @@ namespace WebAPI.Controllers
                         Esn_Todos_FlowModel hisT = new Esn_Todos_FlowModel();
                         SqlCommand cmd = new SqlCommand("", Conn)
                         {
-                            CommandText = @" select a.ConfirmTime,Case When  isnull(e.Names,'')='' then '其他' else e.Names End as ConfirmUserClass
-                            ,Case When isnull(f.Names,'')='' then '其他' else f.Names end as ConfirmMethod
-                            ,a.Create_time,d.cn_name as Create_User_Name,b.Step_Text as ""From"",c.Step_Text as ""To"",a.Description
-                            from esn_Todos_flow_his a
-                            left join esn_todos_Flow_StepType b on a.FromType_id = b.id
-                            left join esn_todos_Flow_StepType c on a.ToType_id = c.id
-                            left join evw_Employee d  on a.Create_User_id = d.user_id
-                            left join esn_category e  on e.ParentId='Flow_Role'  and a.ConfirmUserClass = e.QryKey1 
-                            left join esn_category f  on f.ParentId='Flow_Method'  and a.ConfirmMethod = f.QryKey1 
-                            where a.Flow_id = @Flow_id
-                    "
+                            CommandText = @"select ConfirmTime,ConfirmUserClass,ConfirmMethod,Create_time,Create_User_Name,""From"", ""To"", 
+                                             Description from dbo.efn_Get_Flow_editing_log(@Flow_id)"
                         };
                         cmd.Parameters.AddWithValue("@Flow_id", obj_input["Flowid"].ToString());
                         DataSet ds = SqlToDs(cmd);
@@ -443,11 +434,11 @@ namespace WebAPI.Controllers
                                         CStepTypeNext = AllStepType.Where(p => p.id == StepType_id_Previous).FirstOrDefault();
                                         #region 重置結算日期,是否已解算
 
-                                        if (JtSn["validclass"].ToString() == "PG" || JtSn["validclass"].ToString() == "Leader")
+                                        if (JtSn["validclass"].ToString() == "PG" || JtSn["validclass"].ToString() == "Leader") //強制撤回
                                         {
                                             TOopExecSP += String.Format(@"update esn_todos_points set date_points_settlement=null where sn=" + dsr["sn"] + ";");
                                             TOopExecSP += String.Format(@"update esn_todos_Flow set Is_Settlement=0 where esn_todos_sn=" + dsr["sn"] + ";");
-                                            if (JtSn["validclass"].ToString() == "PG")
+                                            //if (JtSn["validclass"].ToString() == "PG")
                                             {TOopExecSP += String.Format(@"exec [dbo].esp_esn_Todos_V3_AssignStatus 'AS05Back' ," + dsr["sn"] + @",'',@Reject_Description_{0},'',@Wade_User_ID ;", i); //強制拉回需重置運營辦狀態
                                             }
                                         }