gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260303 取消修改检测比例的焊口重新组批

This commit is contained in:
毕文静 2026-03-03 08:52:08 +08:00
parent 3444b526b6
commit 46101bc59e
7 changed files with 135 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/BLL/JGZL/BlowingCleaningItemService.cs
View File

@ -32,7 +32,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.JGZL_BlowingCleaningItem> GetBlowingCleaningItemList(string blowingCleaningId)
{
return (from x in Funs.DB.JGZL_BlowingCleaningItem where x.BlowingCleaningId == blowingCleaningId select x).ToList();
return (from x in Funs.DB.JGZL_BlowingCleaningItem where x.BlowingCleaningId == blowingCleaningId orderby x.ISO_Id ascending select x).ToList();
}
/// <summary>

112
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManageEdit.aspx.cs
View File

@ -322,7 +322,7 @@
}
}
txtPressureTestPackageNo.Text = "/";
//txtPressureTestPackageNo.Text = "/";
}
else
{
@ -637,7 +637,6 @@
{
iso.Joty_D_Level = drpJoty_D_Level.SelectedValue;
}
if (string.IsNullOrEmpty(this.ISO_ID))
{
string newKeyID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_IsoInfo));
@ -730,63 +729,62 @@
}
}
}
if (exitDReport)
{
// 获取组批条件
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", iso.ProjectId);
string setValue = string.Empty;
if (batchC != null)
{
setValue = batchC.SetValue;
}
if (changeList.Count > 0)
{
//改变检测比例的焊口重新组成新批
Model.HJGL_BO_Batch batch = new Model.HJGL_BO_Batch();
batch.BatchId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_Batch));
string batchId = batch.BatchId;
//string perfix = ins.InstallationCode + "-" + isoC.ISC_IsoCode + "-" + ser.SER_Abbreviate + "-" + execS.ExecStandardName + "-";
batch.BatchCode = BLL.SQLHelper.RunProcFlowCode("SpGetFlowCode", "dbo.HJGL_BO_Batch", "BatchCode", changeList[0].InstallationId);
batch.ProjectId = iso.ProjectId;
batch.InstallationId = changeList[0].InstallationId;
batch.BatchCondition = batchC.SetValue;
batch.NDTR_ID = changeList[0].NDTR_ID;
batch.JOTY_ID = changeList[0].JOTY_ID;
batch.ISC_ID = iso.ISC_ID;
batch.STE_ID = iso.STE_ID;
batch.ExecStandardId = iso.ISO_Executive;
batch.IsSpecial = changeList[0].IsSpecial;
batch.WED_ID = changeList[0].JOT_CellWelder;
batch.ISO_ID = changeList[0].ISO_ID;
batch.SER_ID = iso.SER_ID;
batch.TestPackage = changeList[0].PressureTestPackageNo;
batch.BatchStartDate = DateTime.Now.Date;
db.HJGL_BO_Batch.InsertOnSubmit(batch);
foreach (var joint in changeList)
{
if (!string.IsNullOrEmpty(joint.DReportID))
{
var b = batchDetails.FirstOrDefault(x => x.JOT_ID == joint.JOT_ID);
if (b == null)
{
Model.HJGL_BO_BatchDetail batchDetail = new Model.HJGL_BO_BatchDetail();
batchDetail.BatchDetailId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_BatchDetail));
batchDetail.BatchId = batchId;
batchDetail.ISO_ID = joint.ISO_ID;
batchDetail.JOT_ID = joint.JOT_ID;
db.HJGL_BO_BatchDetail.InsertOnSubmit(batchDetail);
}
else
{
b.BatchId = batchId;
}
}
}
}
}
//if (exitDReport)
//{
// // 获取组批条件
// var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", iso.ProjectId);
// string setValue = string.Empty;
// if (batchC != null)
// {
// setValue = batchC.SetValue;
// }
// if (changeList.Count > 0)
// {
// //改变检测比例的焊口重新组成新批
// Model.HJGL_BO_Batch batch = new Model.HJGL_BO_Batch();
// batch.BatchId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_Batch));
// string batchId = batch.BatchId;
// //string perfix = ins.InstallationCode + "-" + isoC.ISC_IsoCode + "-" + ser.SER_Abbreviate + "-" + execS.ExecStandardName + "-";
// batch.BatchCode = BLL.SQLHelper.RunProcFlowCode("SpGetFlowCode", "dbo.HJGL_BO_Batch", "BatchCode", changeList[0].InstallationId);
// batch.ProjectId = iso.ProjectId;
// batch.InstallationId = changeList[0].InstallationId;
// batch.BatchCondition = batchC.SetValue;
// batch.NDTR_ID = changeList[0].NDTR_ID;
// batch.JOTY_ID = changeList[0].JOTY_ID;
// batch.ISC_ID = iso.ISC_ID;
// batch.STE_ID = iso.STE_ID;
// batch.ExecStandardId = iso.ISO_Executive;
// batch.IsSpecial = changeList[0].IsSpecial;
// batch.WED_ID = changeList[0].JOT_CellWelder;
// batch.ISO_ID = changeList[0].ISO_ID;
// batch.SER_ID = iso.SER_ID;
// batch.TestPackage = changeList[0].PressureTestPackageNo;
// batch.BatchStartDate = DateTime.Now.Date;
// db.HJGL_BO_Batch.InsertOnSubmit(batch);
// foreach (var joint in changeList)
// {
// if (!string.IsNullOrEmpty(joint.DReportID))
// {
// var b = batchDetails.FirstOrDefault(x => x.JOT_ID == joint.JOT_ID);
// if (b == null)
// {
// Model.HJGL_BO_BatchDetail batchDetail = new Model.HJGL_BO_BatchDetail();
// batchDetail.BatchDetailId = SQLHelper.GetNewID(typeof(Model.HJGL_BO_BatchDetail));
// batchDetail.BatchId = batchId;
// batchDetail.ISO_ID = joint.ISO_ID;
// batchDetail.JOT_ID = joint.JOT_ID;
// db.HJGL_BO_BatchDetail.InsertOnSubmit(batchDetail);
// }
// else
// {
// b.BatchId = batchId;
// }
// }
// }
// }
//}
db.SubmitChanges();
}
BLL.HJGL_PW_IsoInfoService.UpdateIsoInfo(iso);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改管线信息");
}

34
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx
View File

@ -61,22 +61,42 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckResult1" runat="server" Label="管道压力试验合格" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>
<f:DropDownList ID="drpCheckResult1" runat="server" Label="管道压力试验合格" LabelAlign="Right" LabelWidth="350px">
<f:ListItem Value="合格" Text="合格" Selected="true"/>
<f:ListItem Value="不合格" Text="不合格"/>
<f:ListItem Value="/" Text="/"/>
</f:DropDownList>
<%--<f:TextBox ID="txtCheckResult1" runat="server" Label="管道压力试验合格" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckResult2" runat="server" Label="不参与吹扫/清洗的安全附件及仪表等已隔离或拆除" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>
<Items>
<f:DropDownList ID="drpCheckResult2" runat="server" Label="不参与吹扫/清洗的安全附件及仪表等已隔离或拆除" LabelAlign="Right" LabelWidth="350px">
<f:ListItem Value="合格" Text="合格" Selected="true"/>
<f:ListItem Value="不合格" Text="不合格"/>
<f:ListItem Value="/" Text="/"/>
</f:DropDownList>
<%--<f:TextBox ID="txtCheckResult2" runat="server" Label="不参与吹扫/清洗的安全附件及仪表等已隔离或拆除" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckResult3" runat="server" Label="管道系统的阀门已全部开启" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>
<Items>
<f:DropDownList ID="drpCheckResult3" runat="server" Label="管道系统的阀门已全部开启" LabelAlign="Right" LabelWidth="350px">
<f:ListItem Value="合格" Text="合格" Selected="true"/>
<f:ListItem Value="不合格" Text="不合格"/>
<f:ListItem Value="/" Text="/"/>
</f:DropDownList>
<%--<f:TextBox ID="txtCheckResult3" runat="server" Label="管道系统的阀门已全部开启" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckResult4" runat="server" Label="不锈钢管道用水符合规范要求" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>
<Items>
<f:DropDownList ID="drpCheckResult4" runat="server" Label="不锈钢管道用水符合规范要求" LabelAlign="Right" LabelWidth="350px">
<f:ListItem Value="合格" Text="合格" Selected="true"/>
<f:ListItem Value="不合格" Text="不合格"/>
<f:ListItem Value="/" Text="/"/>
</f:DropDownList>
<%--<f:TextBox ID="txtCheckResult4" runat="server" Label="不锈钢管道用水符合规范要求" LabelAlign="Right" LabelWidth="350px" EmptyText="合格"></f:TextBox>--%>
</Items>
</f:FormRow>
</Rows>

36
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
View File

@ -116,12 +116,12 @@ namespace FineUIPro.Web.JGZL
private void DataIsoInfo()
{
this.txtSystemCode.Text = string.Empty;
this.txtSystemName.Text = string.Empty;
this.txtCheckResult1.Text = string.Empty;
this.txtCheckResult2.Text = string.Empty;
this.txtCheckResult3.Text = string.Empty;
this.txtCheckResult4.Text = string.Empty;
this.txtSystemCode.Text = "01";
this.txtSystemName.Text = "材质";
this.drpCheckResult1.SelectedValue = "合格";
this.drpCheckResult2.SelectedValue = "合格";
this.drpCheckResult3.SelectedValue = "合格";
this.drpCheckResult4.SelectedValue = "合格";
itemLists.Clear();
if (!string.IsNullOrEmpty(this.ProjectId))
{
@ -131,10 +131,10 @@ namespace FineUIPro.Web.JGZL
this.BlowingCleaningId = record.BlowingCleaningId;
this.txtSystemCode.Text = record.SystemCode;
this.txtSystemName.Text = record.SystemName;
this.txtCheckResult1.Text = record.CheckReulst1;
this.txtCheckResult2.Text = record.CheckReulst2;
this.txtCheckResult3.Text = record.CheckReulst3;
this.txtCheckResult4.Text = record.CheckReulst4;
this.drpCheckResult1.SelectedValue = record.CheckReulst1;
this.drpCheckResult2.SelectedValue = record.CheckReulst2;
this.drpCheckResult3.SelectedValue = record.CheckReulst3;
this.drpCheckResult4.SelectedValue = record.CheckReulst4;
itemLists = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(this.BlowingCleaningId);
}
else
@ -160,7 +160,9 @@ namespace FineUIPro.Web.JGZL
newItem.BlowingCleaningItemId = SQLHelper.GetNewID(typeof(Model.JGZL_BlowingCleaningItem));
newItem.ISO_Id = item.ISO_IsoNo;
newItem.STE_ID = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
//newItem.OperatingMedium = item.OperatingPressure;
newItem.OperatingMedium = HJGL_MediumService.GetServiceBySERID(item.SER_ID).SER_Name;
newItem.ScrubbingMedium = "压缩空气";
newItem.CleaningMedium = "洁净水";
itemLists.Add(newItem);
}
}
@ -439,8 +441,8 @@ namespace FineUIPro.Web.JGZL
{ "ISO_Id", "" },
{ "STE_ID", "" },
{ "OperatingMedium", "" },
{ "ScrubbingMedium", "" },
{ "CleaningMedium", "" },
{ "ScrubbingMedium", "压缩空气" },
{ "CleaningMedium", "洁净水" },
{
"Delete3",
String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>",
@ -498,10 +500,10 @@ namespace FineUIPro.Web.JGZL
Model.JGZL_BlowingCleaning newRecord = new JGZL_BlowingCleaning();
newRecord.SystemCode = this.txtSystemCode.Text;
newRecord.SystemName = this.txtSystemName.Text;
newRecord.CheckReulst1 = this.txtCheckResult1.Text;
newRecord.CheckReulst2 = this.txtCheckResult2.Text;
newRecord.CheckReulst3 = this.txtCheckResult3.Text;
newRecord.CheckReulst4 = this.txtCheckResult4.Text;
newRecord.CheckReulst1 = this.drpCheckResult1.SelectedValue;
newRecord.CheckReulst2 = this.drpCheckResult2.SelectedValue;
newRecord.CheckReulst3 = this.drpCheckResult3.SelectedValue;
newRecord.CheckReulst4 = this.drpCheckResult4.SelectedValue;
if (!string.IsNullOrEmpty(this.BlowingCleaningId))
{
newRecord.BlowingCleaningId = this.BlowingCleaningId;

16
HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.designer.cs generated
View File

@ -168,40 +168,40 @@ namespace FineUIPro.Web.JGZL
protected global::FineUIPro.TextBox txtSystemCode;
/// <summary>
/// txtCheckResult1 控件。
/// drpCheckResult1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckResult1;
protected global::FineUIPro.DropDownList drpCheckResult1;
/// <summary>
/// txtCheckResult2 控件。
/// drpCheckResult2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckResult2;
protected global::FineUIPro.DropDownList drpCheckResult2;
/// <summary>
/// txtCheckResult3 控件。
/// drpCheckResult3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckResult3;
protected global::FineUIPro.DropDownList drpCheckResult3;
/// <summary>
/// txtCheckResult4 控件。
/// drpCheckResult4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckResult4;
protected global::FineUIPro.DropDownList drpCheckResult4;
/// <summary>
/// Grid1 控件。

2
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx
View File

@ -51,7 +51,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道系统压力试验记录" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="1" DataIDField="Id" AllowSorting="true"
SortField="PipelineNo" SortDirection="DESC"
SortField="PipelineNo,VoltageStabilizationTime" SortDirection="ASC"
EnableTextSelection="True" AutoScroll="true" OnPreDataBound="Grid1_PreDataBound">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Right">

29
HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
View File

@ -116,8 +116,8 @@ namespace FineUIPro.Web.JGZL
private void DataIsoInfo()
{
this.txtSystemCode.Text = string.Empty;
this.txtSystemName.Text = string.Empty;
this.txtSystemCode.Text = "01";
this.txtSystemName.Text = "材质";
itemLists.Clear();
if (!string.IsNullOrEmpty(this.ProjectId))
{
@ -151,9 +151,22 @@ namespace FineUIPro.Web.JGZL
Model.JGZL_PressureTestOfPipelineSystemRecordItem newItem = new JGZL_PressureTestOfPipelineSystemRecordItem();
newItem.Id = SQLHelper.GetNewID(typeof(Model.JGZL_PressureTestOfPipelineSystemRecordItem));
newItem.PipelineNo = item.ISO_IsoNo;
newItem.DesignPressure = item.ISO_DesignPress.ToString();
newItem.DesignTemperature = item.ISO_DesignTemperature.ToString();
newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem.TestMedium = "水";
newItem.TestPressure = item.ISO_TestPress.HasValue ? item.ISO_TestPress.Value.ToString(("0.##")) + "MPa" : "";
newItem.VoltageStabilizationTime = "10min";
itemLists.Add(newItem);
Model.JGZL_PressureTestOfPipelineSystemRecordItem newItem2 = new JGZL_PressureTestOfPipelineSystemRecordItem();
newItem2.Id = SQLHelper.GetNewID(typeof(Model.JGZL_PressureTestOfPipelineSystemRecordItem));
newItem2.PipelineNo = item.ISO_IsoNo;
newItem2.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##") + "Mpa" : "";
newItem2.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##") + "℃" : "";
newItem2.TestMedium = "水";
newItem2.TestPressure = item.ISO_TestPress.HasValue ? item.ISO_TestPress.Value.ToString("0.##") + "MPa" : "";
newItem2.VoltageStabilizationTime = "30min";
itemLists.Add(newItem2);
}
}
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
@ -342,6 +355,12 @@ namespace FineUIPro.Web.JGZL
string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem m left join JGZL_PressureTestOfPipelineSystemRecord d on d.RecordId = m.RecordId where d.ProjectId=@projectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", projectId));
if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
{
strSql += " and PipelineNo like @isoNo";
listStr.Add(new SqlParameter("@isoNo", "%" + this.drpIsoNoS.SelectedValue + "%"));
}
strSql += " order by PipelineNo,VoltageStabilizationTime asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@ -427,7 +446,7 @@ namespace FineUIPro.Web.JGZL
{ "DesignPressure", "" },
{ "DesignTemperature", "" },
{ "TestTemperature", "" },
{ "TestMedium", "" },
{ "TestMedium", "水" },
{ "TestMediumTemperature", "" },
{ "TestPressure", "" },
{ "VoltageStabilizationTime", "" },