diff --git a/DataBase/版本日志/SGGLDB_V2024-12-30-gaofei.sql b/DataBase/版本日志/SGGLDB_V2024-12-30-gaofei.sql
new file mode 100644
index 00000000..f80a9b2f
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2024-12-30-gaofei.sql
@@ -0,0 +1,25 @@
+
+
+
+--
+IF NOT EXISTS (SELECT * FROM Sys_Const WHERE ConstValue = '2025' and GroupId='0008')
+BEGIN
+ INSERT INTO dbo.Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+ VALUES(newid(),'2025','2025',2025,'0008')
+ END
+GO
+IF NOT EXISTS (SELECT * FROM Sys_Const WHERE ConstValue = '2026' and GroupId='0008')
+BEGIN
+ INSERT INTO dbo.Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+ VALUES(newid(),'2026','2026',2026,'0008')
+ END
+GO
+IF NOT EXISTS (SELECT * FROM Sys_Const WHERE ConstValue = '2027' and GroupId='0008')
+BEGIN
+ INSERT INTO dbo.Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+ VALUES(newid(),'2027','2027',2027,'0008')
+END
+GO
+
+
+
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 60b1b75c..c8047891 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -5081,6 +5081,10 @@ namespace BLL
/// 上报失败
///
public const string UpState_4 = "4";
+ ///
+ /// 已上报（集团已审核）
+ ///
+ public const string UpState_5 = "5";
#endregion
#region 风险管控流程定义
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
index 7653660a..0a0aa25a 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
+using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -48,13 +49,47 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
int Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue);
+ Model.Environmental_ArchitectureReport r = Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarters == Quarters && e.Year == year);
+ if (r != null && r.UpState != BLL.Const.UpState_5)
+ {
+ string cncecAPIUrl = string.Empty;
+ var sysSet9 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团接口地址" select x).ToList().FirstOrDefault();
+ if (sysSet9 != null)
+ {
+ cncecAPIUrl = sysSet9.ConstValue;
+ }
+ if (!string.IsNullOrEmpty(cncecAPIUrl))
+ {
+ try
+ {
+ string getUrl = cncecAPIUrl + "/api/InformationData/GetArchitectureAuditState" + "?unitId=" + BLL.Const.UnitId_SEDIN + "&year=" + year + "&quarters=" + Quarters;
+ var strJosn = APIGetHttpService.Http(getUrl);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ JObject obj = JObject.Parse(strJosn);
+ if (obj["data"] != null && obj["data"].ToString() == "True")
+ {
+ r.UpState = BLL.Const.UpState_5;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+ }
Model.View_Environmental_ArchitectureReport report = Funs.DB.View_Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarters == Quarters && e.Year == year);
if (report != null)
{
string upState = string.Empty;
- if (report.UpState == BLL.Const.UpState_3)
+ if (report.UpState == BLL.Const.UpState_5)
{
- upState = "(已上报)";
+ upState = "(已上报(集团已审核))";
+ }
+ else if (report.UpState == BLL.Const.UpState_3)
+ {
+ upState = "(已上报(集团未审核))";
}
else
{
@@ -185,7 +220,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
if (getReport != null)
{
this.btnNew.Hidden = true;
- //if (getReport.HandleMan == this.CurrUser.PersonId) //当前人是下一步办理入
+ //if (getReport.HandleMan == this.CurrUser.UserId) //当前人是下一步办理入
//{
// if (getReport.HandleState == BLL.Const.HandleState_2)
// {
@@ -357,15 +392,15 @@ namespace FineUIPro.Web.ZHGL.Environmental
///
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
- var units = BLL.UnitService.GetUnitDropDownList();
- if (units != null && !string.IsNullOrEmpty(this.drpUnit.SelectedText))
- {
- var unit = units.FirstOrDefault(x => x.UnitName == this.drpUnit.SelectedText);
- if (unit != null)
- {
- drpUnit.SelectedValue = unit.UnitId;
- }
- }
+ //var units = BLL.UnitService.GetUnitDropDownList();
+ //if (units != null && !string.IsNullOrEmpty(this.drpUnit.SelectedText))
+ //{
+ // var unit = units.FirstOrDefault(x => x.UnitName == this.drpUnit.SelectedText);
+ // if (unit != null)
+ // {
+ // drpUnit.SelectedValue = unit.UnitId;
+ // }
+ //}
GetValue();
}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx
index aef849ad..ce5b7d87 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx
@@ -17,6 +17,11 @@
white-space: normal;
word-break: break-all;
}
+
+ .customlabel span {
+ color: red;
+ font-weight: bold;
+ }
@@ -94,6 +99,7 @@
<%--
--%>
+
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
index cdb9f0e6..31cff99c 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
@@ -475,63 +475,63 @@ namespace FineUIPro.Web.ZHGL.Environmental
private void SetLastYearUnEditableRow()
{
- Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable";
}
#endregion
@@ -1317,18 +1317,54 @@ namespace FineUIPro.Web.ZHGL.Environmental
JObject values = mergedRow.Value("values");
int rowIndex = mergedRow.Value("index");
string sortIndex = values.Value("SortIndex");
- if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
+ if (sortIndex != "01" && sortIndex != "15" && sortIndex != "17" && sortIndex != "19" && sortIndex != "21" && sortIndex != "23"
+ && sortIndex != "37" && sortIndex != "59")
{
- if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
+ if (string.IsNullOrEmpty(values.Value("LastYearValue")))
{
isEmpty = true;
break;
}
+ else
+ {
+ if (values.Value("LastYearValue") != "未涉及")
+ {
+ try
+ {
+ decimal d = Convert.ToDecimal(values.Value("LastYearValue"));
+ }
+ catch (Exception)
+ {
+ isEmpty = true;
+ break;
+ }
+ }
+ }
+ if (string.IsNullOrEmpty(values.Value("ThisYearValue")))
+ {
+ isEmpty = true;
+ break;
+ }
+ else
+ {
+ if (values.Value("ThisYearValue") != "未涉及")
+ {
+ try
+ {
+ decimal d = Convert.ToDecimal(values.Value("ThisYearValue"));
+ }
+ catch (Exception)
+ {
+ isEmpty = true;
+ break;
+ }
+ }
+ }
}
}
if (isEmpty)
{
- ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+ ShowNotify("上年累计和本年累计数据不能为空，必须填报数据或填写“未涉及”！", MessageBoxIcon.Warning);
return;
}
Save("updata");
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs
index 3dfa1903..5fe6073c 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
+using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -48,13 +49,47 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
int month = Funs.GetNewIntOrZero(drpMonth.SelectedValue);
+ Model.Environmental_ChemicalReport r = Funs.DB.Environmental_ChemicalReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Month == month && e.Year == year);
+ if (r != null && r.UpState != BLL.Const.UpState_5)
+ {
+ string cncecAPIUrl = string.Empty;
+ var sysSet9 = (from x in Funs.DB.Sys_Const where x.ConstText == "集团接口地址" select x).ToList().FirstOrDefault();
+ if (sysSet9 != null)
+ {
+ cncecAPIUrl = sysSet9.ConstValue;
+ }
+ if (!string.IsNullOrEmpty(cncecAPIUrl))
+ {
+ try
+ {
+ string getUrl = cncecAPIUrl + "/api/InformationData/GetChemicalReportAuditState" + "?unitId=" + BLL.Const.UnitId_SEDIN + "&year=" + year + "&month=" + month;
+ var strJosn = APIGetHttpService.Http(getUrl);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ JObject obj = JObject.Parse(strJosn);
+ if (obj["data"] != null && obj["data"].ToString() == "True")
+ {
+ r.UpState = BLL.Const.UpState_5;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+ }
Model.View_Environmental_ChemicalReport report = Funs.DB.View_Environmental_ChemicalReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Month == month && e.Year == year);
if (report != null)
{
string upState = string.Empty;
- if (report.UpState == BLL.Const.UpState_3)
+ if (report.UpState == BLL.Const.UpState_5)
{
- upState = "(已上报)";
+ upState = "(已上报(集团已审核))";
+ }
+ else if (report.UpState == BLL.Const.UpState_3)
+ {
+ upState = "(已上报(集团未审核))";
}
else
{
@@ -185,7 +220,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
if (getReport != null)
{
this.btnNew.Hidden = true;
- //if (getReport.HandleMan == this.CurrUser.PersonId) //当前人是下一步办理入
+ //if (getReport.HandleMan == this.CurrUser.UserId) //当前人是下一步办理入
//{
// if (getReport.HandleState == BLL.Const.HandleState_2)
// {
@@ -357,15 +392,15 @@ namespace FineUIPro.Web.ZHGL.Environmental
///
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
{
- var units = BLL.UnitService.GetUnitDropDownList();
- if (units != null && !string.IsNullOrEmpty(this.drpUnit.SelectedText))
- {
- var unit = units.FirstOrDefault(x => x.UnitName == this.drpUnit.SelectedText);
- if (unit != null)
- {
- drpUnit.SelectedValue = unit.UnitId;
- }
- }
+ //var units = BLL.UnitService.GetUnitDropDownList();
+ //if (units != null && !string.IsNullOrEmpty(this.drpUnit.SelectedText))
+ //{
+ // var unit = units.FirstOrDefault(x => x.UnitName == this.drpUnit.SelectedText);
+ // if (unit != null)
+ // {
+ // drpUnit.SelectedValue = unit.UnitId;
+ // }
+ //}
GetValue();
}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx
index 2540e8f0..c51bf2e9 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx
@@ -17,6 +17,11 @@
white-space: normal;
word-break: break-all;
}
+
+ .customlabel span {
+ color: red;
+ font-weight: bold;
+ }
@@ -94,6 +99,7 @@
<%--
--%>
+
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
index 82697f8b..1e2dbf3c 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
@@ -694,104 +694,104 @@ namespace FineUIPro.Web.ZHGL.Environmental
private void SetLastYearUnEditableRow()
{
- Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[14].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[58].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[61].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[62].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[63].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[64].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[65].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[66].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[67].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[69].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[70].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[71].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[72].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[73].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[74].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[75].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[76].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[77].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[78].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[79].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[80].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[81].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[82].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[83].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[84].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[85].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[86].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[87].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[88].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[89].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[90].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[91].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[92].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[93].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[94].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[95].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[97].CellCssClasses[4] = "f-grid-cell-uneditable";
- Grid1.Rows[98].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[1].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[2].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[3].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[4].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[5].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[6].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[7].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[8].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[9].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[10].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[11].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[12].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[13].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[14].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[15].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[16].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[17].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[18].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[19].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[20].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[21].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[22].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[23].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[24].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[25].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[26].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[27].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[28].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[29].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[30].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[31].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[32].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[33].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[34].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[35].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[36].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[37].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[38].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[39].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[40].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[41].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[42].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[43].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[44].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[45].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[46].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[47].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[48].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[49].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[50].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[51].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[52].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[53].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[54].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[55].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[56].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[57].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[58].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[59].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[60].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[61].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[62].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[63].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[64].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[65].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[66].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[67].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[68].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[69].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[70].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[71].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[72].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[73].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[74].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[75].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[76].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[77].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[78].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[79].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[80].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[81].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[82].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[83].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[84].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[85].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[86].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[87].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[88].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[89].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[90].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[91].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[92].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[93].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[94].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[95].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[96].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[97].CellCssClasses[4] = "f-grid-cell-uneditable";
+ //Grid1.Rows[98].CellCssClasses[4] = "f-grid-cell-uneditable";
}
#endregion
@@ -1746,25 +1746,25 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
this.Grid1.Rows[21].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[21].Values[4].ToString()), 2).ToString() + "%";
}
- if (E6 > 0 && E29 > 0)
+ if (E23 > 0 && E29 > 0)
{
- this.Grid1.Rows[23].Values[4] = decimal.Round(E6 * 10000 / E29, 4);
+ this.Grid1.Rows[23].Values[4] = decimal.Round(E29 * 10000 / E23, 4);
}
- if (F6 > 0 && F29 > 0)
+ if (F23 > 0 && F29 > 0)
{
- this.Grid1.Rows[23].Values[5] = decimal.Round(F6 * 10000 / F29, 4);
+ this.Grid1.Rows[23].Values[5] = decimal.Round(F29 * 10000 / F23, 4);
}
if (!string.IsNullOrEmpty(this.Grid1.Rows[23].Values[4].ToString()) && this.Grid1.Rows[23].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[23].Values[5].ToString()))
{
this.Grid1.Rows[23].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[23].Values[4].ToString()), 2).ToString() + "%";
}
- if (E6 > 0 && E74 > 0)
+ if (E23 > 0 && E74 > 0)
{
- this.Grid1.Rows[68].Values[4] = decimal.Round(E6 * 10000 / E74, 4);
+ this.Grid1.Rows[68].Values[4] = decimal.Round(E74 * 10000 / E23, 4);
}
- if (F6 > 0 && F74 > 0)
+ if (F23 > 0 && F74 > 0)
{
- this.Grid1.Rows[68].Values[5] = decimal.Round(F6 * 10000 / F74, 4);
+ this.Grid1.Rows[68].Values[5] = decimal.Round(F74 * 10000 / F23, 4);
}
if (!string.IsNullOrEmpty(this.Grid1.Rows[68].Values[4].ToString()) && this.Grid1.Rows[68].Values[4].ToString() != "0" && !string.IsNullOrEmpty(this.Grid1.Rows[68].Values[5].ToString()))
{
@@ -1907,25 +1907,25 @@ 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("values");
- int rowIndex = mergedRow.Value("index");
- string sortIndex = values.Value("SortIndex");
- if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
- {
- if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
- {
- isEmpty = true;
- break;
- }
- }
- }
- if (isEmpty)
- {
- ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
- return;
- }
+ //foreach (JObject mergedRow in Grid1.GetMergedData())
+ //{
+ // JObject values = mergedRow.Value("values");
+ // int rowIndex = mergedRow.Value("index");
+ // string sortIndex = values.Value("SortIndex");
+ // if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
+ // {
+ // if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
+ // {
+ // isEmpty = true;
+ // break;
+ // }
+ // }
+ //}
+ //if (isEmpty)
+ //{
+ // ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+ // return;
+ //}
Save("add");
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -1939,18 +1939,54 @@ namespace FineUIPro.Web.ZHGL.Environmental
JObject values = mergedRow.Value("values");
int rowIndex = mergedRow.Value("index");
string sortIndex = values.Value("SortIndex");
- if (sortIndex == "19" || sortIndex == "69" || sortIndex == "70")
+ if (sortIndex != "01" && sortIndex != "16" && sortIndex != "18" && sortIndex != "20" && sortIndex != "22" && sortIndex != "24"
+ && sortIndex != "69" && sortIndex != "97")
{
- if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value("ThisYearValue"))) == 0)
+ if (string.IsNullOrEmpty(values.Value("LastYearValue")))
{
isEmpty = true;
break;
}
+ else
+ {
+ if (values.Value("LastYearValue") != "未涉及")
+ {
+ try
+ {
+ decimal d = Convert.ToDecimal(values.Value("LastYearValue"));
+ }
+ catch (Exception)
+ {
+ isEmpty = true;
+ break;
+ }
+ }
+ }
+ if (string.IsNullOrEmpty(values.Value("ThisYearValue")))
+ {
+ isEmpty = true;
+ break;
+ }
+ else
+ {
+ if (values.Value("ThisYearValue") != "未涉及")
+ {
+ try
+ {
+ decimal d = Convert.ToDecimal(values.Value("ThisYearValue"));
+ }
+ catch (Exception)
+ {
+ isEmpty = true;
+ break;
+ }
+ }
+ }
}
}
if (isEmpty)
{
- ShowNotify("工业总产值(可比价)、万元产值二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
+ ShowNotify("上年累计和本年累计数据不能为空，必须填报数据或填写“未涉及”！", MessageBoxIcon.Warning);
return;
}
Save("updata");