1
This commit is contained in:
@@ -17,6 +17,7 @@ using static FineUIPro.Web.TestRun.Report.PreRunSchedule;
|
||||
using Aspose.Words;
|
||||
using static FineUIPro.Web.TestRun.Report.TestRunSchedule;
|
||||
using System.Web.UI.DataVisualization.Charting;
|
||||
using NPOI.POIFS.Crypt.Dsig;
|
||||
|
||||
namespace FineUIPro.Web
|
||||
{
|
||||
@@ -26,6 +27,9 @@ namespace FineUIPro.Web
|
||||
public string oneDataStr { get; set; }
|
||||
public string twoDataStr { get; set; }
|
||||
public string fourDecisionStr { get; set; }
|
||||
public string feedingRunStr { get; set; }
|
||||
public string productsStr { get; set; }
|
||||
public string runProductionStr { get; set; }
|
||||
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
@@ -40,6 +44,9 @@ namespace FineUIPro.Web
|
||||
OneYsc();
|
||||
TwoSc();
|
||||
FourDecision();
|
||||
FeedingRuns();
|
||||
Products();
|
||||
RunProduction();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -265,6 +272,149 @@ namespace FineUIPro.Web
|
||||
fourDecisionStr = JsonConvert.SerializeObject(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 投料试车
|
||||
/// </summary>
|
||||
public void FeedingRuns()
|
||||
{
|
||||
List<FourFiveDto> result = new List<FourFiveDto>();
|
||||
var data = ParamentSettings(1);
|
||||
if (data.Count > 0)
|
||||
{
|
||||
foreach (var item in data)
|
||||
{
|
||||
result.Add(new FourFiveDto()
|
||||
{
|
||||
RunType = item.RunType.Value,
|
||||
SystemName = item.SystemName,
|
||||
InstallationName = item.InstallationName
|
||||
});
|
||||
}
|
||||
feedingRunStr = JsonConvert.SerializeObject(result);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 生产试运行
|
||||
/// </summary>
|
||||
public void Products()
|
||||
{
|
||||
List<FourFiveDto> result = new List<FourFiveDto>();
|
||||
var data = ParamentSettings(2);
|
||||
if (data.Count > 0)
|
||||
{
|
||||
foreach (var item in data)
|
||||
{
|
||||
result.Add(new FourFiveDto()
|
||||
{
|
||||
RunType = item.RunType.Value,
|
||||
SystemName = item.SystemName,
|
||||
InstallationName = item.InstallationName
|
||||
});
|
||||
}
|
||||
productsStr = JsonConvert.SerializeObject(result);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 投料试车和生产试运行数据获取
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private List<ParameterSettingsDto> ParamentSettings(int state)
|
||||
{
|
||||
var result = new List<ParameterSettingsDto>();
|
||||
|
||||
try
|
||||
{
|
||||
if (Funs.DB.Run_ParameterSettings.Count(x => x.ProjectId == this.CurrUser.LoginProjectId && x.States == state) == 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 == state
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result = new List<ParameterSettingsDto>();
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 生产性能考核
|
||||
/// </summary>
|
||||
public void RunProduction()
|
||||
{
|
||||
var result = new SixDto();
|
||||
var data = Funs.DB.Run_ProductionSettings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId);
|
||||
if (data != null)
|
||||
{
|
||||
result.States = data.States.Value;
|
||||
result.StatesName = data.States == 1 ? "考核未开始" : data.States == 2 ? "考核进行中" : data.States == 3 ? "考核已完成" : "考核未开始";
|
||||
result.StartTime = data.StartTime != null ? data.StartTime.Value.ToString("yyyy-MM-dd") : string.Empty;
|
||||
result.EndTime = data.EndTime != null ? data.EndTime.Value.ToString("yyyy-MM-dd") : string.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
result.States = 1;
|
||||
result.StatesName = "考核未开始";
|
||||
}
|
||||
runProductionStr = JsonConvert.SerializeObject(result);
|
||||
}
|
||||
|
||||
#region 实体类
|
||||
|
||||
/// <summary>
|
||||
@@ -285,6 +435,27 @@ namespace FineUIPro.Web
|
||||
public float Rate { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 图4,5
|
||||
/// </summary>
|
||||
public class FourFiveDto
|
||||
{
|
||||
public int RunType { get; set; }
|
||||
public string SystemName { get; set; }
|
||||
public string InstallationName { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 图6
|
||||
/// </summary>
|
||||
public class SixDto
|
||||
{
|
||||
public int States { get; set; }
|
||||
public string StatesName { get; set; }
|
||||
public string StartTime { get; set; }
|
||||
public string EndTime { get; set; }
|
||||
}
|
||||
|
||||
public class WorkPackageInspectDto
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user