shecs/ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2025-01-08 09:23:30 +08:00
parent f06ff52912 b1b1bd37cd
commit 1ea4ebfef6
24 changed files with 122 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
+4 -4
View File
@@ -74,16 +74,16 @@
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道无损检测数量统计表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="PipeCode" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipeCode"
AllowSorting="true" SortField="PipeCode,IsoNo,NDTR_Name" SortDirection="ASC" OnSort="Grid1_Sort"
runat="server" BoxFlex="1" DataKeyNames="IsoNo" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="IsoNo"
AllowSorting="true" SortField="IsoNo" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" AutoScroll="true" Width="100%">
<Columns>
<f:RenderField HeaderText="管道编号" ColumnID="PipeCode" DataField="PipeCode" SortField="PipeCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="包含的单线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo"
<f:RenderField HeaderText="管线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" FieldType="String"
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
{
string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId";
string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId order by IsoNo";//AND InstallationId = @InstallationId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs
Generated
+2 -2
View File
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
+3 -3
View File
@@ -89,7 +89,7 @@
<Items>
<f:Label ID="txtHotHardCode" Label="试验编号" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtCH_TrustUnit" Label="委托单位" runat="server" LabelWidth="105px" LabelAlign="Right">
<f:Label ID="txtCH_TrustUnit" Label="委托单位" runat="server" LabelWidth="110px" LabelAlign="Right">
</f:Label>
</Items>
</f:FormRow>
@@ -97,7 +97,7 @@
<Items>
<f:Label ID="txtSTE_Code" Label="材质" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtTestDate" Label="试验日期" runat="server" LabelWidth="105px" LabelAlign="Right">
<f:Label ID="txtTestDate" Label="热处理委托时间" runat="server" LabelWidth="110px" LabelAlign="Right">
</f:Label>
</Items>
</f:FormRow>
@@ -105,7 +105,7 @@
<Items>
<f:Label ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtEquipmentName" Label="设备/仪器编号" runat="server" LabelWidth="105px" LabelAlign="Right">
<f:Label ID="txtEquipmentName" Label="设备/仪器编号" runat="server" LabelWidth="110px" LabelAlign="Right">
</f:Label>
</Items>
</f:FormRow>
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx
+4 -4
View File
@@ -46,20 +46,20 @@
<f:DropDownList ID="drpUnit" Label="委托单位" runat="server" ShowRedStar="true" Required="true"
FocusOnPageLoad="true" EnableEdit="true" LabelWidth="105px" LabelAlign="Right">
</f:DropDownList>
<f:DatePicker ID="txtTestDate" Label="试验日期" runat="server" ShowRedStar="true" Required="true"
LabelWidth="80px" DateFormatString="yyyy-MM-dd" LabelAlign="Right">
<f:DatePicker ID="txtTestDate" Label="热处理委托时间" runat="server" ShowRedStar="true" Required="true"
LabelWidth="115px" DateFormatString="yyyy-MM-dd" LabelAlign="Right">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlSTE" Label="材质" runat="server" ShowRedStar="true" Required="true"
<f:DropDownList ID="ddlSTE" Label="材质" runat="server" ShowRedStar="true" Required="true" LabelAlign="Right"
EnableEdit="true" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlSTE_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpEquipment" Label="设备/仪器编号" runat="server" EnableEdit="true"
LabelWidth="105px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpEquipment_SelectedIndexChanged">
</f:DropDownList>
<f:TextBox ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right">
<f:TextBox ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="115px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:FormRow>
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs
Generated
+4 -13
View File
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
@@ -130,13 +130,13 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
protected global::FineUIPro.DatePicker txtTestDate;
/// <summary>
/// txtSTE_Code 控件。
/// ddlSTE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSTE_Code;
protected global::FineUIPro.DropDownList ddlSTE;
/// <summary>
/// drpEquipment 控件。
@@ -209,14 +209,5 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ddlSTE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSTE;
}
}
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
+6 -2
View File
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
isNoSameMat = true;
}
if (isoidLog != joint.ISO_ID) //新管线的记录
if (isoidLog != joint.ISO_ID) //新管线的记录
{
Model.HJGL_CH_HardTestReport oldHardTestReport = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportByID(hardTestReportId);
if (oldHardTestReport != null) //更新之前硬度检验报告的热处理状态和检验数量
@@ -172,7 +172,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
hardTestReport.HotHardCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId", "dbo.HJGL_CH_HardTestReport", "HotHardCode", joint.ProjectId, BLL.Base_ProjectService.GetProjectCode(joint.ProjectId) + "-" + iso.ISO_IsoNo + "-");
hardTestReport.ProjectId = joint.ProjectId;
hardTestReport.ISO_ID = iso.ISO_ID;
hardTestReport.TestDate = DateTime.Now;
var date = (from x in Funs.DB.HJGL_CH_HotProessTrustItem
where x.JOT_ID == joint.JOT_ID
orderby x.TrustDate descending
select x.TrustDate).FirstOrDefault();
hardTestReport.TestDate = date;
hardTestReport.TrustUnitId = iso.BSU_ID;
hardTestReport.TestStandard = "GB/T17394.1-2014";
hardTestReport.STE_ID = iso.STE_ID;
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
+2
View File
@@ -1371,6 +1371,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_NDTMethod = n;
t.Flag = flag;
t.CH_TrustType = "1";
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId;
@@ -1493,6 +1494,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_TrustID = SQLHelper.GetNewID(typeof(Model.HJGL_CH_Trust));
t.CH_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-");
t.CH_NDTMethod = ndtItem.Value;
t.CH_TrustUnit = iso.BSU_ID;
t.Flag = flag;
t.CH_TrustType = "1";
t.CH_TrustDate = DateTime.Now;
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
+1
View File
@@ -366,6 +366,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_TrustCode = trustCode;
t.CH_NDTMethod = NDT_ID;
t.CH_TrustType = "2";
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now.Date;
t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId;
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
+11
View File
@@ -41,6 +41,9 @@
<f:DropDownList ID="drpState" runat="server" Label="检测状态" EmptyText="选择查询条件"
Width="180px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" Label="委托单位" EmptyText="选择查询条件" EnableEdit="true"
Width="280px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:FormRow>
</Rows>
@@ -234,6 +237,14 @@
SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="委托单位" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="反馈人" ColumnID="FeedbackMan" DataField="FeedbackMan"
SortField="FeedbackMan" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs
+14
View File
@@ -42,6 +42,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpNdtType.DataBind();
Funs.FineUIPleaseSelect(this.drpNdtType);
this.drpUnit.DataTextField = "UnitName";
this.drpUnit.DataValueField = "UnitId";
this.drpUnit.DataSource = BLL.Base_UnitService.GetAllUnitList();
this.drpUnit.DataBind();
Funs.FineUIPleaseSelect(this.drpUnit);
this.txtEndDate.Text = DateTime.Now.ToShortDateString();
//BindGrid();
Funs.FineUIPleaseSelect(this.drpState);
@@ -171,6 +177,14 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@ndtType", null));
}
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnit.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitId", null));
}
if (!this.ckbFeedbackDate.Checked && !this.ckbTrustDate.Checked)
{
listStr.Add(new SqlParameter("@trustStartDate", null));
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs
Generated
+9
View File
@@ -102,6 +102,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.DropDownList drpState;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// ckbTrustDate 控件。
/// </summary>
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs
+3 -2
View File
@@ -19,7 +19,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
if (!IsPostBack)
{
ListItem[] list = new ListItem[42];
ListItem[] list = new ListItem[44];
list[0] = new ListItem("施工号", "1");
list[1] = new ListItem("试压包编号", "2");
list[2] = new ListItem("管线号", "3");
@@ -62,7 +62,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
list[39] = new ListItem("硬度反馈时间", "40");
list[40] = new ListItem("硬度不合格", "41");
list[41] = new ListItem("检测地点", "42");
list[42] = new ListItem("委托单位", "43");
list[43] = new ListItem("反馈人", "44");
this.cblColumn.DataSource = list;
this.cblColumn.DataBind();