lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交试车代码

Browse Source
This commit is contained in:
高飞
2023-11-06 11:16:46 +08:00
parent 5a130a619b
commit 0b84177640
30 changed files with 2021 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs
+291 -22
View File
@@ -3,6 +3,8 @@ using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
@@ -125,7 +127,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// <summary>
/// 绑定数据
/// </summary>
public void BindGrid()
public void BindGrid(bool istail = false)
{
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
@@ -135,7 +137,65 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
}
//获取子系统
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId && x.InspectedUser == this.CurrUser.UserId).OrderBy(x => x.Sort).ToList();
var data = from termitem in Funs.DB.PreRun_SubInspectTermItem
join b in Funs.DB.PreRun_InspectTailTerm on termitem.TermItemId equals b.TermItemId into t
from tail in t.DefaultIfEmpty()
where termitem.SubInspectId == subInspectId
&& termitem.InspectedUser == this.CurrUser.UserId
group termitem by new { termitem.TermItemId, termitem.SubItemId, termitem.SubInspectId, termitem.WorkPackId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.ProcessesId, termitem.SystemId, termitem.SubSystemId, termitem.InspectedUser, termitem.InspectionResults, termitem.InspectionIllustrate, termitem.Subcontractor, termitem.Contractor, termitem.Supervision, termitem.Owner, termitem.SubcontractorIsPass, termitem.ContractorIsPass, termitem.SupervisionIsPass, termitem.OwnerIsPass, termitem.SubcontractorRemark, termitem.ContractorRemark, termitem.SupervisionRemark, termitem.OwnerRemark, termitem.WorkPackType, termitem.PropertyTechnologyId, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt
orderby gt.Key.Sort
select new TermItemBridDto()
{
TermItemId = gt.Key.TermItemId,
SubItemId = gt.Key.SubItemId,
SubInspectId = gt.Key.SubInspectId,
WorkPackId = gt.Key.WorkPackId,
ProjectId = gt.Key.ProjectId,
WorkInspectId = gt.Key.WorkInspectId,
WorkInspectName = gt.Key.WorkInspectName,
InstallationId = gt.Key.InstallationId,
ProcessesId = gt.Key.ProcessesId,
SystemId = gt.Key.SystemId,
SubSystemId = gt.Key.SubSystemId,
InspectedUser = gt.Key.InspectedUser,
InspectionResults = gt.Key.InspectionResults,
InspectionIllustrate = gt.Key.InspectionIllustrate,
Subcontractor = gt.Key.Subcontractor,
Contractor = gt.Key.Contractor,
Supervision = gt.Key.Supervision,
Owner = gt.Key.Owner,
SubcontractorIsPass = gt.Key.SubcontractorIsPass,
ContractorIsPass = gt.Key.ContractorIsPass,
SupervisionIsPass = gt.Key.SupervisionIsPass,
OwnerIsPass = gt.Key.OwnerIsPass,
SubcontractorRemark = gt.Key.SubcontractorRemark,
ContractorRemark = gt.Key.ContractorRemark,
SupervisionRemark = gt.Key.SupervisionRemark,
OwnerRemark = gt.Key.OwnerRemark,
WorkPackType = gt.Key.WorkPackType,
PropertyTechnologyId = gt.Key.PropertyTechnologyId,
Remark = gt.Key.Remark,
AddUser = gt.Key.AddUser,
AddTime = gt.Key.AddTime,
Sort = gt.Key.Sort,
IsTailTerm = gt.Key.IsTailTerm
};
var list = data.ToList();
//list = list.OrderBy(o => o.Sort).ToList();
if (istail)
{
JArray mergedData = Grid1.GetMergedData();
list.ForEach(a =>
{
var itemRow = mergedData.FirstOrDefault(x => x.Value<string>("id") == a.TermItemId);
JObject values = itemRow.Value<JObject>("values");
var inspectionResults = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionResults")) ? values.Value<string>("InspectionResults") : string.Empty;
if (!string.IsNullOrWhiteSpace(inspectionResults))
{
a.InspectionResults = int.Parse(inspectionResults);
}
});
}
Grid1.DataSource = list;
Grid1.DataBind();
}
@@ -161,8 +221,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
try
{
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.SubcontractorIsPass != null || x.ContractorIsPass != null || x.SupervisionIsPass != null || x.OwnerIsPass != null)) > 0)
{
ShowNotify("已进入检查表流转，无法修改检查结果!", MessageBoxIcon.Warning);
return;
}
JArray mergedData = Grid1.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 subItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
if (values.Value<string>("InspectionResults") == "0")
{
if (Funs.DB.PreRun_InspectTailTerm.Count(x => x.TermItemId == subItemId) == 0)
{
ShowNotify("未通过的检查项请填写尾项!", MessageBoxIcon.Warning);
return;
}
}
}
foreach (JObject mergedRow in mergedData)
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
@@ -172,7 +253,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId);
if (model != null)
{
//model.SubInspectId
model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionIllustrate")) ? values.Value<string>("InspectionIllustrate") : string.Empty;
if (!string.IsNullOrWhiteSpace(values.Value<string>("InspectionResults")))
{
@@ -181,7 +261,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Funs.DB.SubmitChanges();
}
}
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
if (subModel != null)
{
@@ -229,6 +308,145 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public string SubSystemId { get; set; }
}
/// <summary>
/// 尾项数据绑定实体
/// </summary>
public class TermItemBridDto
{
/// <summary>
/// 主键
/// </summary>
public string TermItemId { get; set; }
/// <summary>
/// 检查项主键
/// </summary>
public string SubItemId { get; set; }
/// <summary>
/// 检查表主键
/// </summary>
public string SubInspectId { get; set; }
/// <summary>
/// 工作包主键
/// </summary>
public string WorkPackId { get; set; }
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 工作包模板项主键
/// </summary>
public string WorkInspectId { get; set; }
/// <summary>
/// 检查事项名称
/// </summary>
public string WorkInspectName { get; set; }
/// <summary>
/// 装置主键
/// </summary>
public string InstallationId { get; set; }
/// <summary>
/// 工序主键
/// </summary>
public string ProcessesId { get; set; }
/// <summary>
/// 系统主键
/// </summary>
public string SystemId { get; set; }
/// <summary>
/// 子系统主键
/// </summary>
public string SubSystemId { get; set; }
/// <summary>
/// 检查人主键
/// </summary>
public string InspectedUser { get; set; }
/// <summary>
/// 检查结果0:未通过 1:通过
/// </summary>
public int? InspectionResults { get; set; }
/// <summary>
/// 检查说明
/// </summary>
public string InspectionIllustrate { get; set; }
/// <summary>
/// 分包商
/// </summary>
public string Subcontractor { get; set; }
/// <summary>
/// 承包商
/// </summary>
public string Contractor { get; set; }
/// <summary>
/// 监理
/// </summary>
public string Supervision { get; set; }
/// <summary>
/// 业主
/// </summary>
public string Owner { get; set; }
/// <summary>
/// 分包商是否通过0/null:未通过 1:通过
/// </summary>
public int? SubcontractorIsPass { get; set; }
/// <summary>
/// 承包商是否通过0/null:未通过 1:通过
/// </summary>
public int? ContractorIsPass { get; set; }
/// <summary>
/// 监理是否通过0/null:未通过 1:通过
/// </summary>
public int? SupervisionIsPass { get; set; }
/// <summary>
/// 业主是否通过0/null:未通过 1:通过
/// </summary>
public int? OwnerIsPass { get; set; }
/// <summary>
/// 分包商备注
/// </summary>
public string SubcontractorRemark { get; set; }
/// <summary>
/// 承包商备注
/// </summary>
public string ContractorRemark { get; set; }
/// <summary>
/// 监理备注
/// </summary>
public string SupervisionRemark { get; set; }
/// <summary>
/// 业主备注
/// </summary>
public string OwnerRemark { get; set; }
/// <summary>
/// 类型0=全部1=管道2=设备
/// </summary>
public int? WorkPackType { get; set; }
/// <summary>
/// 管道或工艺设备主键
/// </summary>
public string PropertyTechnologyId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 添加人
/// </summary>
public string AddUser { get; set; }
/// <summary>
/// 添加日期
/// </summary>
public DateTime? AddTime { get; set; }
/// <summary>
/// 排序
/// </summary>
public int? Sort { get; set; }
/// <summary>
/// 是否存在尾项0:不存在1:存在
/// </summary>
public int IsTailTerm { get; set; }
}
/// <summary>
/// 已生成检查表的管道/设备
/// </summary>
@@ -280,25 +498,63 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
//尾项申请
if (e.CommandName == "TailTerm")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
if (inspectionResults == 0)
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var tailModel = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TermItemId == termItemId);
if (tailModel != null)
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
}
else
{
JArray mergedData = Grid1.GetMergedData();
var itemRow = mergedData[e.RowIndex].Value<JObject>("values");
if (itemRow.Value<string>("InspectionResults") == "0")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning);
}
}
}
//尾项修改
if (e.CommandName == "TailTermUpdate")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
if (inspectionResults == 0)
{
var tails = Funs.DB.PreRun_InspectTailTerm.Where(x => x.TermItemId == termItemId).ToList();
if (tails.Count > 0)
{
if (tails.Count(x => x.ApproveState == 0) == 0)
{
ShowNotify("申请的尾项非“待提交处理”状态，无法修改！", MessageBoxIcon.Warning);
return;
}
if (tails.Count(x => x.ApproveState == 0) > 1)
{
string window = $"SelectTailTermList.aspx?TermItemId={termItemId}";
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidTailTermId.ClientID) + Window2.GetShowReference(window));
}
else
{
var tailModel = tails.FirstOrDefault();
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - ")));
}
}
else
{
ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning);
ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning);
}
}
}
@@ -308,7 +564,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
BindGrid(true);
}
/// <summary>
@@ -316,17 +572,30 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
//System.Data.DataRowView row = e.DataItem as System.Data.DataRowView;
//LinkButtonField TailTerm = Grid1.FindColumn("TailTerm") as LinkButtonField;
//var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
//if (inspectionResults != 0)
//{
// TailTerm.Enabled = true;
//}
//else
//{
// TailTerm.Enabled = false;
//}
var isTailTerm = Grid1.DataKeys[e.RowIndex][4].ToString();
LinkButtonField TailTermUpdate = Grid1.FindColumn("TailTermUpdate") as LinkButtonField;
if (isTailTerm == "0")
{
e.CellCssClasses[TailTermUpdate.ColumnIndex] = "hidethis";
}
}
/// <summary>
/// 尾项选择关闭
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window2_Close(object sender, WindowCloseEventArgs e)
{
if (!string.IsNullOrWhiteSpace(hidTailTermId.Text))
{
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text);
if (model != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", hidTailTermId.Text, model.TermItemId, "编辑 - ")));
}
}
}
}
}