1
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged"
|
||||
ShowBorder="true" ActiveTabIndex="1" runat="server">
|
||||
<Tabs>
|
||||
|
||||
<f:Tab Title="预试车数据设置" BodyPadding="10px" Layout="Fit" runat="server">
|
||||
<Items>
|
||||
<f:Grid Height="550px" ID="GridYsc" ShowBorder="true" ClicksToEdit="1" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="ScheduleId" DataKeyNames="ScheduleId,WorkPackId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="10" AllowFilters="true" EnableSummary="true" SummaryPosition="Flow">
|
||||
@@ -128,7 +129,6 @@
|
||||
</Items>
|
||||
</f:Tab>
|
||||
|
||||
|
||||
<f:Tab Title="三查四定进度" BodyPadding="10px" runat="server">
|
||||
<Items>
|
||||
<f:Grid Height="550px" ID="GridScsd" ClicksToEdit="1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="ScheduleId" DataKeyNames="ScheduleId,LevelName" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="10" AllowFilters="true" EnableSummary="true" SummaryPosition="Flow">
|
||||
@@ -170,6 +170,103 @@
|
||||
</Items>
|
||||
</f:Tab>
|
||||
|
||||
<f:Tab Title="投料试车设置" BodyPadding="10px" runat="server">
|
||||
<Items>
|
||||
<f:Grid Height="550px" ID="gvFeeding" ClicksToEdit="1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="SettingsId" DataKeyNames="SettingsId,InstallationId,ProcessesId,SystemId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="10" AllowFilters="true" EnableSummary="true" SummaryPosition="Flow">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar5" runat="server">
|
||||
<Items>
|
||||
<f:Button ID="btnFeedingSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnFeedingSave_Click"></f:Button>
|
||||
<f:ToolbarFill ID="ToolbarFill3" runat="server"></f:ToolbarFill>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
|
||||
<f:RenderField HeaderText="装置名称" ColumnID="InstallationName" DataField="InstallationName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="工序名称" ColumnID="ProcessesName" DataField="ProcessesName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="系统名称" ColumnID="SystemName" DataField="SystemName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="状态" ColumnID="RunType" DataField="RunType" HeaderTextAlign="Center" TextAlign="Center" Width="100px" RendererFunction="renderRunType">
|
||||
<Editor>
|
||||
<f:DropDownList ID="ddlRunType" Required="true" EnableEdit="false" ForceSelection="false" runat="server">
|
||||
<f:ListItem Text="未投料" Value="1" />
|
||||
<f:ListItem Text="投料中" Value="2" />
|
||||
<f:ListItem Text="投料完成" Value="3" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Tab>
|
||||
|
||||
<f:Tab Title="生产性能考核" BodyPadding="10px" runat="server">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar6" runat="server">
|
||||
<Items>
|
||||
<f:ToolbarFill ID="ToolbarFill4" runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnSubmit" runat="server" Text="保存" OnClick="btnSubmit_Click">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Items>
|
||||
<f:RadioButton ID="rbtNotStarted" Label="考核类型" Checked="true" GroupName="checkGroup"
|
||||
Text="考核未开始" runat="server" OnCheckedChanged="rbtCheck_CheckedChanged" AutoPostBack="true">
|
||||
</f:RadioButton>
|
||||
<f:RadioButton ID="rbtInProgress" GroupName="checkGroup" ShowEmptyLabel="true" Text="考核进行中" runat="server"
|
||||
OnCheckedChanged="rbtCheck_CheckedChanged" AutoPostBack="true">
|
||||
</f:RadioButton>
|
||||
<f:RadioButton ID="rbtComplete" GroupName="checkGroup" ShowEmptyLabel="true" Text="考核已完成" runat="server"
|
||||
OnCheckedChanged="rbtCheck_CheckedChanged" AutoPostBack="true">
|
||||
</f:RadioButton>
|
||||
</Items>
|
||||
<Items>
|
||||
<f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd" Label="开始日期" Width="300px" EmptyText="请选择开始日期"
|
||||
ID="txtStartData" Hidden="true">
|
||||
</f:DatePicker>
|
||||
<f:DatePicker ID="txtEndData" Required="true" Readonly="false" CompareControl="txtStartData" DateFormatString="yyyy-MM-dd"
|
||||
CompareOperator="GreaterThan" CompareMessage="结束日期应该大于开始日期" Label="结束日期" Width="300px"
|
||||
runat="server" Hidden="true">
|
||||
</f:DatePicker>
|
||||
</Items>
|
||||
</f:Tab>
|
||||
|
||||
<f:Tab Title="生产试运行设置" BodyPadding="10px" runat="server">
|
||||
<Items>
|
||||
<f:Grid Height="550px" ID="gvProduc" ClicksToEdit="1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="SettingsId" DataKeyNames="SettingsId,InstallationId,ProcessesId,SystemId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="10" AllowFilters="true" EnableSummary="true" SummaryPosition="Flow">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar7" runat="server">
|
||||
<Items>
|
||||
<f:Button ID="btnProducSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnProducSave_Click"></f:Button>
|
||||
<f:ToolbarFill ID="ToolbarFill5" runat="server"></f:ToolbarFill>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderTextAlign="Center" TextAlign="Center" />
|
||||
<f:RenderField HeaderText="装置名称" ColumnID="InstallationName" DataField="InstallationName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="工序名称" ColumnID="ProcessesName" DataField="ProcessesName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="系统名称" ColumnID="SystemName" DataField="SystemName" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="状态" ColumnID="RunType" DataField="RunType" HeaderTextAlign="Center" TextAlign="Center" Width="100px" RendererFunction="renderProducRunType">
|
||||
<Editor>
|
||||
<f:DropDownList ID="ddlProducRunType" Required="true" EnableEdit="false" ForceSelection="false" runat="server">
|
||||
<f:ListItem Text="未运行" Value="1" />
|
||||
<f:ListItem Text="运行中" Value="2" />
|
||||
<f:ListItem Text="停车检修" Value="3" />
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Tab>
|
||||
|
||||
</Tabs>
|
||||
</f:TabStrip>
|
||||
@@ -217,6 +314,7 @@
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
|
||||
//预试车合计
|
||||
function onGridYscAfterEdit(event, value, params) {
|
||||
var me = F('<%= GridYsc.ClientID %>');
|
||||
@@ -309,6 +407,7 @@
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
|
||||
//三查四定合计
|
||||
function onGridScsdAfterEdit(event, value, params) {
|
||||
var me = F('<%= GridScsd.ClientID %>');
|
||||
@@ -327,6 +426,25 @@
|
||||
me.updateSummaryCellValue('CompleteNum', completeNumTotal, true);
|
||||
}
|
||||
|
||||
//投料试车状态
|
||||
var ddlRunType = '<%= ddlRunType.ClientID %>';
|
||||
function renderRunType(value) {
|
||||
if (value == -1) {
|
||||
return '';
|
||||
} else {
|
||||
return F(ddlRunType).getTextByValue(value);
|
||||
}
|
||||
}
|
||||
|
||||
//生产试运行状态
|
||||
var ddlProducRunType = '<%= ddlProducRunType.ClientID %>';
|
||||
function renderProducRunType(value) {
|
||||
if (value == -1) {
|
||||
return '';
|
||||
} else {
|
||||
return F(ddlProducRunType).getTextByValue(value);
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@@ -21,6 +21,8 @@ using NPOI.SS.Util;
|
||||
using NPOI.XSSF.UserModel;
|
||||
using System.IO;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using FineUIPro.Web.ProjectData;
|
||||
using System.Web.Services.Description;
|
||||
|
||||
namespace FineUIPro.Web.TestRun.Report
|
||||
{
|
||||
@@ -856,6 +858,351 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
|
||||
#endregion
|
||||
|
||||
#region 投料试车
|
||||
|
||||
/// <summary>
|
||||
/// 投料试车绑定
|
||||
/// </summary>
|
||||
public void gvFeedingBrid()
|
||||
{
|
||||
var result = new List<ParameterSettingsDto>();
|
||||
if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 1) == 0)
|
||||
{
|
||||
var query = from runsys in Funs.DB.PreRun_SysDevice
|
||||
join install in Funs.DB.PreRun_SysDevice on runsys.InstallationId equals install.PreRunId
|
||||
join proce in Funs.DB.PreRun_SysDevice on runsys.ProcessesId equals proce.PreRunId
|
||||
join project in Funs.DB.Base_Project on runsys.ProjectId equals project.ProjectId
|
||||
where runsys.PreRunLevel == 3 && runsys.ProjectId == this.CurrUser.LoginProjectId
|
||||
orderby runsys.Sort ascending
|
||||
select new ParameterSettingsDto()
|
||||
{
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
ProjectName = project.ProjectName,
|
||||
InstallationId = runsys.InstallationId,
|
||||
InstallationName = install.PreRunName,
|
||||
ProcessesId = runsys.ProcessesId,
|
||||
ProcessesName = proce.PreRunName,
|
||||
SystemId = runsys.PreRunId,
|
||||
SystemName = runsys.PreRunName,
|
||||
States = 1,
|
||||
RunType = 1
|
||||
};
|
||||
if (query.Count() > 0)
|
||||
{
|
||||
result = query.ToList();
|
||||
result.ForEach(x => { x.SettingsId = Guid.NewGuid().ToString(); });
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var query = from setting in Funs.DB.Run_ParameterSettings
|
||||
join install in Funs.DB.PreRun_SysDevice on setting.InstallationId equals install.PreRunId
|
||||
join proce in Funs.DB.PreRun_SysDevice on setting.ProcessesId equals proce.PreRunId
|
||||
join sys in Funs.DB.PreRun_SysDevice on setting.SystemId equals sys.PreRunId
|
||||
join project in Funs.DB.Base_Project on setting.ProjectId equals project.ProjectId
|
||||
where setting.ProjectId == this.CurrUser.LoginProjectId && setting.States == 1
|
||||
orderby setting.Sort ascending
|
||||
select new ParameterSettingsDto()
|
||||
{
|
||||
SettingsId = setting.SettingsId,
|
||||
ProjectId = setting.ProjectId,
|
||||
ProjectName = project.ProjectName,
|
||||
InstallationId = setting.InstallationId,
|
||||
InstallationName = install.PreRunName,
|
||||
ProcessesId = setting.ProcessesId,
|
||||
ProcessesName = proce.PreRunName,
|
||||
SystemId = setting.SystemId,
|
||||
SystemName = sys.PreRunName,
|
||||
States = setting.States,
|
||||
RunType = setting.RunType,
|
||||
AddUser = setting.AddUser,
|
||||
AddTime = setting.AddTime,
|
||||
Sort = setting.Sort,
|
||||
};
|
||||
if (query.Count() > 0)
|
||||
{
|
||||
result = query.ToList();
|
||||
}
|
||||
}
|
||||
gvFeeding.DataSource = result;
|
||||
TabStrip1.ActiveTabIndex = 3;
|
||||
gvFeeding.DataBind();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 投料试车保存
|
||||
/// </summary>
|
||||
protected void btnFeedingSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
var deletelist = Funs.DB.Run_ParameterSettings.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 1);
|
||||
Funs.DB.Run_ParameterSettings.DeleteAllOnSubmit(deletelist);
|
||||
Funs.DB.SubmitChanges();
|
||||
var addList = new List<Run_ParameterSettings>();
|
||||
JArray mergedData = gvFeeding.GetMergedData();
|
||||
foreach (JObject mergedRow in mergedData)
|
||||
{
|
||||
string status = mergedRow.Value<string>("status");
|
||||
JObject values = mergedRow.Value<JObject>("values");
|
||||
int i = mergedRow.Value<int>("index");
|
||||
var model = new Run_ParameterSettings();
|
||||
model.SettingsId = this.gvFeeding.Rows[i].DataKeys[0].ToString();
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.InstallationId = this.gvFeeding.Rows[i].DataKeys[1].ToString();
|
||||
model.ProcessesId = this.gvFeeding.Rows[i].DataKeys[2].ToString();
|
||||
model.SystemId = this.gvFeeding.Rows[i].DataKeys[3].ToString();
|
||||
model.States = 1;
|
||||
var runtype = !string.IsNullOrWhiteSpace(values.Value<string>("RunType")) ? values.Value<string>("RunType") : string.Empty;
|
||||
if (!string.IsNullOrWhiteSpace(runtype))
|
||||
{
|
||||
model.RunType = int.Parse(runtype);
|
||||
}
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
model.AddTime = DateTime.Now;
|
||||
model.Sort = i;
|
||||
addList.Add(model);
|
||||
}
|
||||
Funs.DB.Run_ParameterSettings.InsertAllOnSubmit(addList);
|
||||
Funs.DB.SubmitChanges();
|
||||
gvFeedingBrid();
|
||||
ShowNotify("保存成功!");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ShowNotify(ex.Message, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 生产性能考核
|
||||
|
||||
/// <summary>
|
||||
/// 生产性能考核绑定
|
||||
/// </summary>
|
||||
public void PerformPageInit()
|
||||
{
|
||||
var model = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId);
|
||||
if (model != null)
|
||||
{
|
||||
if (model.States == 1)
|
||||
{
|
||||
txtStartData.Hidden = true;
|
||||
txtEndData.Hidden = true;
|
||||
rbtNotStarted.Checked = true;
|
||||
}
|
||||
else if (model.States == 2)
|
||||
{
|
||||
txtStartData.Hidden = false;
|
||||
txtEndData.Hidden = false;
|
||||
rbtInProgress.Checked = true;
|
||||
txtStartData.Text = model.StartTime.Value.ToString("yyyy-MM-dd");
|
||||
txtEndData.Text = model.EndTime.Value.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (model.States == 2)
|
||||
{
|
||||
txtStartData.Hidden = true;
|
||||
txtEndData.Hidden = true;
|
||||
rbtComplete.Checked = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 保存
|
||||
/// </summary>
|
||||
protected void btnSubmit_Click(object sender, EventArgs e)
|
||||
{
|
||||
bool add = false;
|
||||
if (rbtInProgress.Checked && string.IsNullOrWhiteSpace(txtStartData.Text))
|
||||
{
|
||||
ShowNotify("开始时间不能为空!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (rbtInProgress.Checked && string.IsNullOrWhiteSpace(txtEndData.Text))
|
||||
{
|
||||
ShowNotify("结束时间不能为空!", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
var state = 0;
|
||||
if (rbtNotStarted.Checked)
|
||||
{
|
||||
state = 1;
|
||||
}
|
||||
if (rbtInProgress.Checked)
|
||||
{
|
||||
state = 2;
|
||||
}
|
||||
if (rbtComplete.Checked)
|
||||
{
|
||||
state = 3;
|
||||
}
|
||||
var model = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId);
|
||||
if (model == null)
|
||||
{
|
||||
add = true;
|
||||
model = new Run_ProductionSettings();
|
||||
model.ProductionId = Guid.NewGuid().ToString();
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
model.AddTime = DateTime.Now;
|
||||
}
|
||||
model.States = state;
|
||||
if (state == 2)
|
||||
{
|
||||
model.StartTime = DateTime.Parse(txtStartData.Text.ToString());
|
||||
model.EndTime = DateTime.Parse(txtEndData.Text.ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
model.StartTime = null;
|
||||
model.EndTime = null;
|
||||
}
|
||||
if (add) Funs.DB.Run_ProductionSettings.InsertOnSubmit(model);
|
||||
Funs.DB.SubmitChanges();
|
||||
PerformPageInit();
|
||||
ShowNotify("保存成功!");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 考核选择
|
||||
/// </summary>
|
||||
protected void rbtCheck_CheckedChanged(object sender, CheckedEventArgs e)
|
||||
{
|
||||
if (rbtInProgress.Checked)
|
||||
{
|
||||
txtStartData.Hidden = false;
|
||||
txtEndData.Hidden = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
txtStartData.Hidden = true;
|
||||
txtEndData.Hidden = true;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 生产试运行
|
||||
|
||||
/// <summary>
|
||||
///生产试运行绑定
|
||||
/// </summary>
|
||||
public void gvProducBrid()
|
||||
{
|
||||
var result = new List<ParameterSettingsDto>();
|
||||
if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 2) == 0)
|
||||
{
|
||||
var query = from runsys in Funs.DB.PreRun_SysDevice
|
||||
join install in Funs.DB.PreRun_SysDevice on runsys.InstallationId equals install.PreRunId
|
||||
join proce in Funs.DB.PreRun_SysDevice on runsys.ProcessesId equals proce.PreRunId
|
||||
join project in Funs.DB.Base_Project on runsys.ProjectId equals project.ProjectId
|
||||
where runsys.PreRunLevel == 3 && runsys.ProjectId == this.CurrUser.LoginProjectId
|
||||
orderby runsys.Sort ascending
|
||||
select new ParameterSettingsDto()
|
||||
{
|
||||
ProjectId = this.CurrUser.LoginProjectId,
|
||||
ProjectName = project.ProjectName,
|
||||
InstallationId = runsys.InstallationId,
|
||||
InstallationName = install.PreRunName,
|
||||
ProcessesId = runsys.ProcessesId,
|
||||
ProcessesName = proce.PreRunName,
|
||||
SystemId = runsys.PreRunId,
|
||||
SystemName = runsys.PreRunName,
|
||||
States = 2,
|
||||
RunType = 1
|
||||
};
|
||||
if (query.Count() > 0)
|
||||
{
|
||||
result = query.ToList();
|
||||
result.ForEach(x => { x.SettingsId = Guid.NewGuid().ToString(); });
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var query = from setting in Funs.DB.Run_ParameterSettings
|
||||
join install in Funs.DB.PreRun_SysDevice on setting.InstallationId equals install.PreRunId
|
||||
join proce in Funs.DB.PreRun_SysDevice on setting.ProcessesId equals proce.PreRunId
|
||||
join sys in Funs.DB.PreRun_SysDevice on setting.SystemId equals sys.PreRunId
|
||||
join project in Funs.DB.Base_Project on setting.ProjectId equals project.ProjectId
|
||||
where setting.ProjectId == this.CurrUser.LoginProjectId && setting.States == 2
|
||||
orderby setting.Sort ascending
|
||||
select new ParameterSettingsDto()
|
||||
{
|
||||
SettingsId = setting.SettingsId,
|
||||
ProjectId = setting.ProjectId,
|
||||
ProjectName = project.ProjectName,
|
||||
InstallationId = setting.InstallationId,
|
||||
InstallationName = install.PreRunName,
|
||||
ProcessesId = setting.ProcessesId,
|
||||
ProcessesName = proce.PreRunName,
|
||||
SystemId = setting.SystemId,
|
||||
SystemName = sys.PreRunName,
|
||||
States = setting.States,
|
||||
RunType = setting.RunType,
|
||||
AddUser = setting.AddUser,
|
||||
AddTime = setting.AddTime,
|
||||
Sort = setting.Sort,
|
||||
};
|
||||
if (query.Count() > 0)
|
||||
{
|
||||
result = query.ToList();
|
||||
}
|
||||
}
|
||||
gvProduc.DataSource = result;
|
||||
TabStrip1.ActiveTabIndex = 5;
|
||||
gvProduc.DataBind();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 生产试运行保存
|
||||
/// </summary>
|
||||
protected void btnProducSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
var deletelist = Funs.DB.Run_ParameterSettings.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == 2);
|
||||
Funs.DB.Run_ParameterSettings.DeleteAllOnSubmit(deletelist);
|
||||
Funs.DB.SubmitChanges();
|
||||
var addList = new List<Run_ParameterSettings>();
|
||||
JArray mergedData = gvProduc.GetMergedData();
|
||||
foreach (JObject mergedRow in mergedData)
|
||||
{
|
||||
string status = mergedRow.Value<string>("status");
|
||||
JObject values = mergedRow.Value<JObject>("values");
|
||||
int i = mergedRow.Value<int>("index");
|
||||
var model = new Run_ParameterSettings();
|
||||
model.SettingsId = this.gvProduc.Rows[i].DataKeys[0].ToString();
|
||||
model.ProjectId = this.CurrUser.LoginProjectId;
|
||||
model.InstallationId = this.gvProduc.Rows[i].DataKeys[1].ToString();
|
||||
model.ProcessesId = this.gvProduc.Rows[i].DataKeys[2].ToString();
|
||||
model.SystemId = this.gvProduc.Rows[i].DataKeys[3].ToString();
|
||||
model.States = 2;
|
||||
var runtype = !string.IsNullOrWhiteSpace(values.Value<string>("RunType")) ? values.Value<string>("RunType") : string.Empty;
|
||||
if (!string.IsNullOrWhiteSpace(runtype))
|
||||
{
|
||||
model.RunType = int.Parse(runtype);
|
||||
}
|
||||
model.AddUser = this.CurrUser.UserId;
|
||||
model.AddTime = DateTime.Now;
|
||||
model.Sort = i;
|
||||
addList.Add(model);
|
||||
}
|
||||
Funs.DB.Run_ParameterSettings.InsertAllOnSubmit(addList);
|
||||
Funs.DB.SubmitChanges();
|
||||
gvProducBrid();
|
||||
ShowNotify("保存成功!");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
ShowNotify(ex.Message, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
#region 私有方法
|
||||
|
||||
/// <summary>
|
||||
@@ -919,6 +1266,21 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
//三查四定
|
||||
DataBridScsd();
|
||||
}
|
||||
else if (TabStrip1.ActiveTabIndex == 3)
|
||||
{
|
||||
//投料试车
|
||||
gvFeedingBrid();
|
||||
}
|
||||
else if (TabStrip1.ActiveTabIndex == 4)
|
||||
{
|
||||
//生产性能考核
|
||||
PerformPageInit();
|
||||
}
|
||||
else if (TabStrip1.ActiveTabIndex == 5)
|
||||
{
|
||||
//生产试运行
|
||||
gvProducBrid();
|
||||
}
|
||||
}
|
||||
|
||||
public class Run_ScheduleSetUpDto : Run_ScheduleSetUp
|
||||
@@ -979,6 +1341,29 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
public int CloseNum { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 投料试车实体
|
||||
/// </summary>
|
||||
public class ParameterSettingsDto : Run_ParameterSettings
|
||||
{
|
||||
/// <summary>
|
||||
/// 项目名称
|
||||
/// </summary>
|
||||
public string ProjectName { get; set; }
|
||||
/// <summary>
|
||||
/// 装置名称
|
||||
/// </summary>
|
||||
public string InstallationName { get; set; }
|
||||
/// <summary>
|
||||
/// 工序名称
|
||||
/// </summary>
|
||||
public string ProcessesName { get; set; }
|
||||
/// <summary>
|
||||
/// 系统名称
|
||||
/// </summary>
|
||||
public string SystemName { get; set; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
@@ -346,5 +346,167 @@ namespace FineUIPro.Web.TestRun.Report
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox NumberBox3;
|
||||
|
||||
/// <summary>
|
||||
/// gvFeeding 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid gvFeeding;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar5;
|
||||
|
||||
/// <summary>
|
||||
/// btnFeedingSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnFeedingSave;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill3;
|
||||
|
||||
/// <summary>
|
||||
/// ddlRunType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlRunType;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar6;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill4;
|
||||
|
||||
/// <summary>
|
||||
/// btnSubmit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSubmit;
|
||||
|
||||
/// <summary>
|
||||
/// rbtNotStarted 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButton rbtNotStarted;
|
||||
|
||||
/// <summary>
|
||||
/// rbtInProgress 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButton rbtInProgress;
|
||||
|
||||
/// <summary>
|
||||
/// rbtComplete 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButton rbtComplete;
|
||||
|
||||
/// <summary>
|
||||
/// txtStartData 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtStartData;
|
||||
|
||||
/// <summary>
|
||||
/// txtEndData 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtEndData;
|
||||
|
||||
/// <summary>
|
||||
/// gvProduc 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid gvProduc;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar7 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar7;
|
||||
|
||||
/// <summary>
|
||||
/// btnProducSave 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnProducSave;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill5;
|
||||
|
||||
/// <summary>
|
||||
/// ddlProducRunType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlProducRunType;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user