lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-04-10 10:45:57 +08:00
parent 774af1be61
commit eb753a1fa4
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
View File

@ -1228,7 +1228,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
ShowNotify("该月份记录已存在！", MessageBoxIcon.Warning);
return;
}
}
}
else
{
Model.Environmental_ArchitectureReport oldReport = BLL.ArchitectureReportService.GetArchitectureReportByArchitectureReportId(ArchitectureReportId);
@ -1248,7 +1248,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
newItem.ArchitectureReportId = report.ArchitectureReportId;
newItem.BaseNumber = System.Web.HttpUtility.HtmlDecode(item.BaseNumber);
newItem.SortIndex = System.Web.HttpUtility.HtmlDecode(item.SortIndex);
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(item.LastYearValue);
string str = item.LastYearValue;
if (str == "6E-05")
{
str = "0.00006";
}
newItem.LastYearValue = System.Web.HttpUtility.HtmlDecode(str);
newItem.ThisYearValue = System.Web.HttpUtility.HtmlDecode(item.ThisYearValue);
newItem.Rate = System.Web.HttpUtility.HtmlDecode(item.Rate);
ArchitectureReportItemService.AddArchitectureReportItem(newItem);
@ -1265,7 +1270,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
else if (code=="3")
else if (code == "3")
{
Alert.ShowInParent("集团当前季度数据已锁定，无法上传！", MessageBoxIcon.Error);
}
@ -1284,26 +1289,26 @@ namespace FineUIPro.Web.ZHGL.Environmental
protected void btnSave_Click(object sender, EventArgs e)
{
/* bool isEmpty = false;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int rowIndex = mergedRow.Value<int>("index");
string sortIndex = values.Value<string>("SortIndex");
if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
{
if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
{
isEmpty = true;
break;
}
}
}
if (isEmpty)
{
ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
return;
}*/
/* bool isEmpty = false;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int rowIndex = mergedRow.Value<int>("index");
string sortIndex = values.Value<string>("SortIndex");
if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
{
if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
{
isEmpty = true;
break;
}
}
}
if (isEmpty)
{
ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
return;
}*/
Save("add");
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -1331,7 +1336,12 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
try
{
decimal d = Convert.ToDecimal(values.Value<string>("LastYearValue"));
string str = values.Value<string>("LastYearValue");
if (str == "6E-05")
{
str = "0.00006";
}
decimal d = Convert.ToDecimal(str);
}
catch (Exception)
{

2
SGGL/Model/Model.csproj
View File

@ -29,7 +29,7 @@
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>5</WarningLevel>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\Model.xml</DocumentationFile>
</PropertyGroup>