Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
@@ -555,14 +555,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject
|
||||
this.txtWeather.Text = getW.WeatherRef;
|
||||
this.txtTemperature.Text = getW.AllTem;
|
||||
}
|
||||
var log = (from x in Funs.DB.ZHGL_ConstructionLog
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == today
|
||||
select x).FirstOrDefault();
|
||||
if (log != null)
|
||||
{
|
||||
this.txtWeather.Text = log.Weather;
|
||||
this.txtTemperature.Text = log.Temperature;
|
||||
}
|
||||
//var log = (from x in Funs.DB.ZHGL_ConstructionLog
|
||||
// where x.ProjectId == this.CurrUser.LoginProjectId && x.CompileDate == today
|
||||
// select x).FirstOrDefault();
|
||||
//if (log != null)
|
||||
//{
|
||||
// this.txtWeather.Text = log.Weather;
|
||||
// this.txtTemperature.Text = log.Temperature;
|
||||
//}
|
||||
this.txtCompileMan.Text = this.CurrUser.PersonName;
|
||||
this.drpContractNo.SelectedIndex = 0;
|
||||
this.drpUnitWork.SelectedIndex = 0;
|
||||
|
||||
+1
-1
@@ -237694,7 +237694,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(50)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstValue", DbType="NVarChar(500)")]
|
||||
public string ConstValue
|
||||
{
|
||||
get
|
||||
|
||||
Reference in New Issue
Block a user