feat:發票抬頭功能修改

feat:回傳日期改 "YYYY-MM"
feat: 設定 cors "https://sol-dev.essenptl.com/sol/"

WebAPI/Controllers/CustomerController.cs

@@ -27,7 +27,7 @@ namespace WebAPI.Controllers
         [Route("Get_CustomerListTP")]
         [CorsHandle]
         [HttpPost]
-        public HttpResponseMessage Get_CustomerList(ParamModel param)
+        public HttpResponseMessage Get_CustomerListTP(ParamModel param)
         {
             if (param != null && param.Input != null && !string.IsNullOrWhiteSpace((param.Input.ToString())))
             {
@@ -43,7 +43,7 @@ namespace WebAPI.Controllers
                             left join (select customer_id from essen_request_info a1 where a1.request_id=@request_id) b on a.customer_id=b.customer_id
                              where a.is_enabled=1 "
                         };
-                        cmd.Parameters.Add("@request_id", obj_input["request_id"].ToString());
+                        cmd.Parameters.AddWithValue("@request_id", obj_input["request_id"] ==null ?"" :obj_input["request_id"].ToString());
                         DataTable dt = SqlToDt(cmd);
                         response.Msg = JsonConvert.SerializeObject(dt);
                         response.Code = "1";
@@ -64,7 +64,46 @@ namespace WebAPI.Controllers
             result.Content = new StringContent(JsonConvert.SerializeObject(response), System.Text.Encoding.UTF8, "application/json");
             return result;
         }
+        [Route("Get_CustomerList")]
+        [CorsHandle]
+        [HttpPost]
+        public HttpResponseMessage Get_CustomerList(ParamModel param)
+        {
+            if (param != null && param.Input != null && !string.IsNullOrWhiteSpace((param.Input.ToString())))
+            {
+                string input = param.Input.ToString();
+                try
+                {
+                    JObject obj_input = JObject.Parse(input.ToString());
+                    using (SqlConnection Conn = new SqlConnection(connString))
+                    {
+                        SqlCommand cmd = new SqlCommand("", Conn)
+                        {
+                            CommandText = @"select a.customer_name,a.customer_id,case when isnull(b.customer_id,'')!='' then 1 else 0 end isSelect from c_customer a
+                            left join (select customer_id from essen_customer a1 where a1.request_customer_id=@request_id) b on a.customer_id=b.customer_id
+                             where a.is_enabled=1 "
+                        };
+                        cmd.Parameters.AddWithValue("@request_id", obj_input["request_id"] == null ? "" : obj_input["request_id"].ToString());
+                        DataTable dt = SqlToDt(cmd);
+                        response.Msg = JsonConvert.SerializeObject(dt);
+                        response.Code = "1";
+                    }
+                }
+                catch (Exception e)
+                {
+                    response.Code = "0";
+                    response.Msg = "Exception:" + e.StackTrace;
+                }
 
+            }
+            else
+            {
+                response.Code = "0";
+                response.Msg = "no input or format error";
+            }
+            result.Content = new StringContent(JsonConvert.SerializeObject(response), System.Text.Encoding.UTF8, "application/json");
+            return result;
+        }
         [Route("Update_CustomerListTP")]
         [CorsHandle]
         [HttpPost]
@@ -111,10 +150,10 @@ namespace WebAPI.Controllers
             result.Content = new StringContent(JsonConvert.SerializeObject(response), System.Text.Encoding.UTF8, "application/json");
             return result;
         }
-        [Route("Delete_CustomerListTP")]
+        [Route("Update_CustomerList")]
         [CorsHandle]
         [HttpPost]
-        public HttpResponseMessage Delete_CustomerListTP(ParamModel param)
+        public HttpResponseMessage Update_CustomerList(ParamModel param)
         {
             if (param != null && param.Input != null && !string.IsNullOrWhiteSpace((param.Input.ToString())))
             {
@@ -126,8 +165,16 @@ namespace WebAPI.Controllers
                     {
                         SqlCommand cmd = new SqlCommand("", Conn)
                         {
-                            CommandText = @"delete from essen_request_info where request_id=@request_id;"
+                            CommandText = @"MERGE INTO essen_customer WITH(HOLDLOCK)  as target USING(
+                            select @request_id as request_id, @customer_id as customer_id ) as source (request_id,customer_id)
+                            on(target.request_id = source.request_id   )
+                            WHEN MATCHED THEN UPDATE SET customer_id = @customer_id 
+                            WHEN NOT MATCHED THEN INSERT(request_id,customer_id) 
+                            VALUES(@request_id,@customer_id );"
                         };
+
+
+                        cmd.Parameters.AddWithValue("@customer_id", obj_input["customer_id"].ToString());
                         cmd.Parameters.AddWithValue("@request_id", obj_input["request_id"].ToString());
                         DataTable dt = SqlToDt(cmd);
                         response.Msg = JsonConvert.SerializeObject(dt);
@@ -150,10 +197,10 @@ namespace WebAPI.Controllers
             return result;
         }
 
-        [Route("Update_CustomerList")]
+        [Route("Delete_CustomerListTP")]
         [CorsHandle]
         [HttpPost]
-        public HttpResponseMessage Update_CustomerList(ParamModel param)
+        public HttpResponseMessage Delete_CustomerListTP(ParamModel param)
         {
             if (param != null && param.Input != null && !string.IsNullOrWhiteSpace((param.Input.ToString())))
             {
@@ -165,14 +212,9 @@ namespace WebAPI.Controllers
                     {
                         SqlCommand cmd = new SqlCommand("", Conn)
                         {
-                            CommandText = @"MERGE INTO essen_customer WITH(HOLDLOCK)  as target USING(select * from essen_customer a　where a.customer_id=@customer_id) as source (customer_id,request_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(customer_id,request_customer_id) 
-                            VALUES(@customer_id,@request_customer_id)"
+                            CommandText = @"delete from essen_request_info where request_id=@request_id;"
                         };
-                        cmd.Parameters.AddWithValue("@customer_id", obj_input["customer_id"].ToString());
-                        cmd.Parameters.AddWithValue("@request_customer_id", obj_input["request_customer_id"].ToString());
+                        cmd.Parameters.AddWithValue("@request_id", obj_input["request_id"].ToString());
                         DataTable dt = SqlToDt(cmd);
                         response.Msg = JsonConvert.SerializeObject(dt);
                         response.Code = "1";

WebAPI/Controllers/Esn_Subitem/Esn_todosController.cs

@@ -242,7 +242,7 @@ namespace WebAPI.Controllers
                                         ,StepType_id =(select id from esn_todos_Flow_StepType a where a.Map_Class='HR') output INSERTED.id INTO @TempTable where esn_todos_sn =@SN{0};
                                         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) 
-                                       select id as Flow_id,GETDATE(),a.StepType_id_Previous,StepType_id,@gWadeID,'HR','SL','結算日期:' + @valueText,@gWadeID,GETDATE() from esn_todos_Flow a where a.id=@FlowId;
+                                       select id as Flow_id,GETDATE(),a.StepType_id_Previous,StepType_id,@gWadeID,'HR','SL','結算日期:' + @value,@gWadeID,GETDATE() from esn_todos_Flow a where a.id=@FlowId;
                                         ", i);
                             return_sn.Add(dr["SN"].ToString());
 
@@ -254,7 +254,6 @@ namespace WebAPI.Controllers
 
                         }
                         cmd.Parameters.AddWithValue("@value", value);
-                        cmd.Parameters.AddWithValue("@valueText", DateTime.Parse(value).ToString("yyyy-MM"));
                         cmd.Parameters.AddWithValue("@gWadeID", obj_input["gWadeID"].ToString());
 
                         string JSONString = string.Empty;

WebAPI/Tool/CorsHandle.cs

@@ -27,6 +27,7 @@ public class CorsHandle : Attribute, ICorsPolicyProvider
         objProlicy.Origins.Add("https://dev.essenptl.com");
         objProlicy.Origins.Add("https://mtest.purplevineip.com");
         objProlicy.Origins.Add("https://mtest2.purplevineip.com");
+        objProlicy.Origins.Add("https://sol-dev.essenptl.com/");
         //objProlicy.Origins.Add("http://ite.essenptl.com");
         //objProlicy.Origins.Add("https://ite.essenptl.com");