Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New
This commit is contained in:
@@ -6,7 +6,10 @@ using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using BLL;
|
||||
using BLL.Common;
|
||||
using BLL.Common;
|
||||
using FastReport.Cloud.OAuth;
|
||||
using FineUIPro.Web.DataShow;
|
||||
using Org.BouncyCastle.Crypto;
|
||||
|
||||
namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
@@ -39,11 +42,11 @@ namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
btnClose.OnClientClick = ActiveWindow.GetHideReference();
|
||||
btnClose.OnClientClick = ActiveWindow.GetHideReference();
|
||||
this.DeviceId = Request.Params["DeviceId"];
|
||||
if (!string.IsNullOrEmpty(this.DeviceId))
|
||||
{
|
||||
Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x=>x.DeviceId==this.DeviceId);
|
||||
Model.Project_Devices device = Funs.DB.Project_Devices.FirstOrDefault(x => x.DeviceId == this.DeviceId);
|
||||
if (device != null)
|
||||
{
|
||||
this.txtDeviceName.Text = device.DeviceName;
|
||||
@@ -59,8 +62,8 @@ namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
this.dpCreateDate.Text = string.Format("{0:yyyy-MM-dd}", device.CreateDate);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -74,15 +77,15 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// <param name="e"></param>
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
Model.Project_Devices device = new Model.Project_Devices
|
||||
{
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
DeviceName = this.txtDeviceName.Text.Trim(),
|
||||
DeviceSerial = this.txtDeviceSerial.Text.Trim(),
|
||||
Address = txtAddress.Text.Trim(),
|
||||
ValidateCode=txtValidateCode.Text.Trim(),
|
||||
ValidateCode = txtValidateCode.Text.Trim(),
|
||||
CreateDate = Funs.GetNewDateTime(this.dpCreateDate.Text.Trim())
|
||||
};
|
||||
if (this.drpInOut.SelectedValue != BLL.Const._Null)
|
||||
@@ -121,9 +124,9 @@ namespace FineUIPro.Web.ProjectData
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user