Commit 65b63a88 by guanzhenshan

调整页面,增加解析订单费用配置删除标志

parent ed9fcdf2
...@@ -70,5 +70,14 @@ namespace Bailun.DC.Models.DataWareHouse ...@@ -70,5 +70,14 @@ namespace Bailun.DC.Models.DataWareHouse
/// </summary> /// </summary>
public string datacenter_col { get; set; } public string datacenter_col { get; set; }
/// <summary>
/// 币种
/// </summary>
public string currency { get; set; }
/// <summary>
/// 是否已删除 1:已删除,0:未删除
/// </summary>
public int delstatus { get; set; }
} }
} }
...@@ -74,7 +74,7 @@ namespace Bailun.DC.Services.DataWareHouse ...@@ -74,7 +74,7 @@ namespace Bailun.DC.Services.DataWareHouse
cn.Open(); cn.Open();
} }
cn.Execute($"delete from order_fee_config where platform='{configs.FirstOrDefault().platform}' and website='{configs.FirstOrDefault().website}'"); cn.Execute($"update order_fee_config set delstatus=1 where platform='{configs.FirstOrDefault().platform}' and website='{configs.FirstOrDefault().website}'");
foreach (var item in configs) foreach (var item in configs)
{ {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="alert alert-warning"> <div class="alert alert-warning">
提示:1、没有会计科目编码和项目编码的是不参与会计统计的
</div> </div>
<div class="ibox-content m-b-sm border-bottom"> <div class="ibox-content m-b-sm border-bottom">
<form id="toolbar"> <form id="toolbar">
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
field: 'datatime', title: '账单时间', width: '160' field: 'datatime', title: '账单时间', width: '160'
}, },
{ field: 'orderno', title: '单号', width: '160'}, { field: 'orderno', title: '单号', width: '160'},
{ field: 'datacenter_col', title: '数据中心费用类型', width: '160'}, { field: 'datacenter_col', title: '数据中心费用类型', width: '180'},
/*{ field: 'financecategory', title: '会计科目分类', width: '130' },*/ /*{ field: 'financecategory', title: '会计科目分类', width: '130' },*/
{ field: 'subjectcode', title: '会计科目编码', width: '130' }, { field: 'subjectcode', title: '会计科目编码', width: '130' },
{ field: 'projectcode', title: '项目编码', width: '120' }, { field: 'projectcode', title: '项目编码', width: '120' },
......
...@@ -347,6 +347,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -347,6 +347,7 @@ namespace Bailun.DC.Web.Controllers
var projectcode = row["项目编码"].ToString(); var projectcode = row["项目编码"].ToString();
var datacentercol = row["数据中心字段"].ToString(); var datacentercol = row["数据中心字段"].ToString();
var note = row["备注"].ToString(); var note = row["备注"].ToString();
var currency = row["币种"].ToString();
//格式化组合条件 //格式化组合条件
var _condition = "{"; var _condition = "{";
...@@ -385,6 +386,8 @@ namespace Bailun.DC.Web.Controllers ...@@ -385,6 +386,8 @@ namespace Bailun.DC.Web.Controllers
projectcode = projectcode, projectcode = projectcode,
platform = platform, platform = platform,
website = website, website = website,
currency = currency,
delstatus = 0
}; };
list.Add(m); list.Add(m);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment