修改施工日志

This commit is contained in:
2023-09-14 10:43:51 +08:00
parent 2b6b7c5d5e
commit c96394016a
11 changed files with 2347 additions and 173 deletions
@@ -53,20 +53,20 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
this.drpWeather.SelectedValue = constructionLog.Weather;
}
if (constructionLog.TemperatureMin != null)
{
this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
}
if (constructionLog.TemperatureMax != null)
{
this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
}
//if (constructionLog.TemperatureMin != null)
//{
// this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
//}
//if (constructionLog.TemperatureMax != null)
//{
// this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
//}
if (constructionLog.CompileDate != null)
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructionLog.CompileDate);
}
this.txtMainWork.Text = constructionLog.MainWork;
this.txtMainProblems.Text = constructionLog.MainProblems;
//this.txtMainWork.Text = constructionLog.MainWork;
//this.txtMainProblems.Text = constructionLog.MainProblems;
this.txtRemark.Text = constructionLog.Remark;
}
@@ -152,11 +152,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
Model.ZHGL_ConstructionLog constructionLog = new Model.ZHGL_ConstructionLog();
constructionLog.Weather = drpWeather.SelectedValue;
constructionLog.ProjectId = CurrUser.LoginProjectId;
constructionLog.TemperatureMin = Funs.GetNewInt(this.txtTemperatureMin.Text.Trim());
constructionLog.TemperatureMax = Funs.GetNewInt(this.txtTemperatureMax.Text.Trim());
//constructionLog.TemperatureMin = Funs.GetNewInt(this.txtTemperatureMin.Text.Trim());
//constructionLog.TemperatureMax = Funs.GetNewInt(this.txtTemperatureMax.Text.Trim());
constructionLog.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
constructionLog.MainWork = this.txtMainWork.Text;
constructionLog.MainProblems = this.txtMainProblems.Text;
//constructionLog.MainWork = this.txtMainWork.Text;
//constructionLog.MainProblems = this.txtMainProblems.Text;
constructionLog.Remark = this.txtRemark.Text;
if (!string.IsNullOrEmpty(ConstructionLogId) && ConstructionLogService.GetConstructionLogById(Request.Params["ConstructionLogId"]) != null)
{
@@ -48,20 +48,20 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
this.txtWeather.Text = constructionLog.Weather;
}
if (constructionLog.TemperatureMin != null)
{
this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
}
if (constructionLog.TemperatureMax != null)
{
this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
}
//if (constructionLog.TemperatureMin != null)
//{
// this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
//}
//if (constructionLog.TemperatureMax != null)
//{
// this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
//}
if (constructionLog.CompileDate != null)
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructionLog.CompileDate);
}
this.txtMainWork.Text = constructionLog.MainWork;
this.txtMainProblems.Text = constructionLog.MainProblems;
//this.txtMainWork.Text = constructionLog.MainWork;
//this.txtMainProblems.Text = constructionLog.MainProblems;
this.txtRemark.Text = constructionLog.Remark;
}
else