改寫 費用帶出時間 TO config_type

WebAPI/Controllers/FeeOfferConfigController.cs

@@ -248,6 +248,15 @@ namespace WebAPI.Controllers
                 ids.Add(AddFieldName, "");
                 if (!String.IsNullOrWhiteSpace(FieldValue)) Noticemsg += "(無" + FieldName + ":" + FieldValue + "),";
             }
+
+            FieldName = "費用帶出時間"; AddFieldName = "config_type_name"; FieldValue = drRow[FieldName].ToString();
+            drTemp = MetaData.Tables[11].AsEnumerable().Where(p => p.Field<String>("config_type_name") == FieldValue).FirstOrDefault();
+            if (drTemp != null) ids.Add("config_type", drTemp["config_type"].ToString());
+            else
+            {
+                ids.Add("config_type", "AD");
+                if (!String.IsNullOrWhiteSpace(FieldValue)) Noticemsg += "(無" + FieldName + ":" + FieldValue + "),";
+            }
             #endregion
             return errmsg;
         }
@@ -292,6 +301,7 @@ namespace WebAPI.Controllers
                         Temps.Add("tax_id_name", ids["fo_tax_rate_name"]);
                         Temps.Add("currency_id", ids["currency_id"].ToString());
                         Temps.Add("country_id", ids["country_id"].ToString());
+                        Temps.Add("config_type", ids["config_type"].ToString());
                         Temps.Add("update_user_id", u_user_id);
 
                         String config_id = Guid.NewGuid().ToString().ToUpper(), fee_type_id = Guid.NewGuid().ToString().ToUpper();
@@ -338,7 +348,7 @@ namespace WebAPI.Controllers
                             DataSet ds_IsExistsFeeOfferConfig = IsExistsFeeOfferConfig(ref cmd, Temps);
                             if (ds_IsExistsFeeOfferConfig.Tables[0].Rows.Count == 0)
                             {
-                                //AddFeeOfferConfig(ref cmd, Temps);
+                            AddFeeOfferConfig(ref cmd, Temps);
                             }
                             else
                             {
@@ -496,6 +506,7 @@ namespace WebAPI.Controllers
             cmd.Parameters.AddWithValue("@zh_tw", item["zh_tw"].ToString());
             cmd.Parameters.AddWithValue("@en_us", item["en_us"].ToString());
             cmd.Parameters.AddWithValue("@currency_id", item["currency_id"].ToString());
+            //cmd.Parameters.AddWithValue("@basic_fee", Convert.ToDouble(item["basic_fee"].ToString()));
             cmd.Parameters.AddWithValue("@basic_fee_small", Convert.ToDouble(item["basic_fee_small"].ToString()));
             cmd.Parameters.AddWithValue("@basic_fee_micro", Convert.ToDouble(item["basic_fee_micro"].ToString()));
             cmd.Parameters.AddWithValue("@fee_from", Convert.ToDouble(item["fee_from"].ToString()));
@@ -544,7 +555,8 @@ namespace WebAPI.Controllers
         private Boolean AddFeeOfferConfigInfo(ref SqlCommand cmd, Dictionary<string, string> item)
         {
             cmd.CommandText = @"INSERT INTO dbo.s_fee_offer_config_info
-                (config_info_id,config_id,ctrl_proc_id,fee_type_id,config_type,amount,currency_id,tax_id,tax_type,seq, fee_from, fee_to,item_fee_small,item_fee_micro, item_exceed_unit,item_unit,is_shibao,is_gean,is_item_fee,item_exceed,item_fee,review_stage,is_export,remark1)  OUTPUT Inserted.config_info_id  
+                (config_info_id,config_id,ctrl_proc_id,fee_type_id,config_type,amount,currency_id,tax_id,tax_type,seq, fee_from, fee_to,
+                item_fee_small,item_fee_micro, item_exceed_unit,item_unit,is_shibao,is_gean,is_item_fee,item_exceed,item_fee,review_stage,is_export,remark1)  OUTPUT Inserted.config_info_id  
                 VALUES(NEWID(),@config_id,@ctrl_proc_id,@fee_type_id,@config_type,@amount,@currency_id,@tax_id,@tax_type,@seq,@fee_from, @fee_to,@item_fee_small,@item_fee_micro, @item_exceed_unit,@item_unit,@is_shibao,@is_gean,@is_item_fee,@item_exceed,@item_fee,@review_stage,@is_export,@remark1); ";
 
 
@@ -554,7 +566,7 @@ namespace WebAPI.Controllers
             cmd.Parameters.AddWithValue("@case_type_id", item["case_type_id"].ToString());
             cmd.Parameters.AddWithValue("@apply_type_id", item["apply_type_id"].ToString());
             cmd.Parameters.AddWithValue("@fee_type_id", item["fee_type_id"].ToString());
-            cmd.Parameters.AddWithValue("@config_type", "AD");
+            cmd.Parameters.AddWithValue("@config_type", item["config_type"].ToString());
             cmd.Parameters.AddWithValue("@tax_id", item["tax_id_name"].ToString());
             cmd.Parameters.AddWithValue("@tax_type", item["tax_type_name"].ToString());
 
@@ -581,8 +593,8 @@ namespace WebAPI.Controllers
             cmd.Parameters.AddWithValue("@is_export", 1);
             cmd.Parameters.AddWithValue("@fc_cate_id", item["fc_cate_id"].ToString());
             cmd.Parameters.AddWithValue("@seq", item["seq"].ToString());
-            //cmd.Parameters.AddWithValue("@remark1", "系統導入");
-            cmd.Parameters.AddWithValue("@remark1", "soltest");
+            cmd.Parameters.AddWithValue("@remark1", "系統導入");
+            //cmd.Parameters.AddWithValue("@remark1", "");
 
             DataTable dt = InsertSqlToDr(cmd);
             return dt.Rows.Count > 0;
@@ -604,7 +616,9 @@ namespace WebAPI.Controllers
                             SELECT business_type_id,business_type_{0},business_type_{1} FROM dbo.i_business_type ; SELECT fc_cate_id,text_{0},text_{1} FROM dbo.i_fc_category where is_enabled=1; 
                             select customer_id,customer_name_en,customer_name  from c_customer a where  is_enabled=1 and isnull(customer_name,'') <> '';SELECT case_status_id,case_status_{0},case_status_{1} FROM i_case_status;
                             SELECT dictionary_id,value,text_{0},text_{1} FROM dbo.s_dictionary WHERE dictionary_name = 'fee_cate_workitem';  SELECT dictionary_id,value,text_{0},text_{1}  FROM dbo.s_dictionary WHERE dictionary_name ='fo_tax_rate_name';
-                            select currency_id,currency_name_{0},currency_name_{1} from i_currency a;select country_id,country_{0},country_{1} from i_country a", Country1, Country2);
+                            select currency_id,currency_name_{0},currency_name_{1} from i_currency a;select country_id,country_{0},country_{1} from i_country a;
+                            select '完成处理事项' as config_type_name, 'FI' as config_type  union   select '新增处理事项' as config_type_name, 'AD' as config_type;
+                            ", Country1, Country2);
 
             cmd.CommandText = str;
             DataSet MetaData = GetSqlToDs(cmd);