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

111

This commit is contained in:
佘春生 2025-02-14 16:48:50 +08:00
parent 86b1e8b3da
commit 6d4a7e82a7
51 changed files with 1888 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HJGL_ZH/BLL/HJGL/HotHardManage/HJGL_CH_HardTestReportService.cs
View File

@ -236,6 +236,7 @@ namespace BLL
newCH_HardTestReport.STE_ID = cH_Trust.STE_ID; newCH_HardTestReport.STE_ID = cH_Trust.STE_ID;
newCH_HardTestReport.TrustName = cH_Trust.TrustName; newCH_HardTestReport.TrustName = cH_Trust.TrustName;
newCH_HardTestReport.ReportName = cH_Trust.ReportName; newCH_HardTestReport.ReportName = cH_Trust.ReportName;
newCH_HardTestReport.ExecStandard = cH_Trust.ExecStandard;
db.SubmitChanges(); db.SubmitChanges();
} }
@ -327,6 +328,7 @@ namespace BLL
newTrustItem.HotProessTrustId = trustItem.HotProessTrustId; newTrustItem.HotProessTrustId = trustItem.HotProessTrustId;
newTrustItem.Flag = trustItem.Flag; newTrustItem.Flag = trustItem.Flag;
newTrustItem.IsShow = trustItem.IsShow; newTrustItem.IsShow = trustItem.IsShow;
newTrustItem.CheckDate = trustItem.CheckDate;
db.HJGL_CH_HardTestReportItem.InsertOnSubmit(newTrustItem); db.HJGL_CH_HardTestReportItem.InsertOnSubmit(newTrustItem);
db.SubmitChanges(); db.SubmitChanges();
} }
@ -346,6 +348,7 @@ namespace BLL
newItem.Remark = trustItem.Remark; newItem.Remark = trustItem.Remark;
newItem.Flag = trustItem.Flag; newItem.Flag = trustItem.Flag;
newItem.NewFlag = trustItem.NewFlag; newItem.NewFlag = trustItem.NewFlag;
newItem.CheckDate = trustItem.CheckDate;
db.SubmitChanges(); db.SubmitChanges();
} }
} }

18
HJGL_ZH/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
View File

@ -1313,6 +1313,24 @@ namespace BLL
return name; return name;
} }
public static string ConvertJointCodeString(string jotIdList)
{
string name = string.Empty;
string[] list = jotIdList.Split(',');
foreach (var item in list)
{
if (!string.IsNullOrEmpty(item))
{
name += GetJointInfoByJotID(item).JOT_JointNo + ",";
}
}
if (!string.IsNullOrEmpty(name))
{
name = name.Substring(0, name.LastIndexOf(","));
}
return name;
}
/// <summary> /// <summary>
/// 根据焊口号、管线ID、项目Id获取焊口信息 /// 根据焊口号、管线ID、项目Id获取焊口信息
/// </summary> /// </summary>

12
HJGL_ZH/BLL/WeldMat/Stock/StockInService.cs
View File

@ -196,6 +196,18 @@ namespace BLL
} }
} }
public static void WarrantybookSure(string stockInId, bool? isSure, string sureMan)
{
Model.SGGLDB db = Funs.DB;
Model.Weld_StockIn newStockIn = db.Weld_StockIn.FirstOrDefault(e => e.StockInId == stockInId);
if (newStockIn != null)
{
newStockIn.IsSure= isSure;
newStockIn.SureMan= sureMan;
db.SubmitChanges();
}
}
/// <summary> /// <summary>
/// 根据主键删除焊材入库 /// 根据主键删除焊材入库
/// </summary> /// </summary>

6
HJGL_ZH/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -72,8 +72,8 @@
Title="底部面板" ShowBorder="false" ShowHeader="false" Layout="Fit"> Title="底部面板" ShowBorder="false" ShowHeader="false" Layout="Fit">
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" DataKeyNames="ISO_ID" AllowSorting="true" SortField="Record_PrintDate"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="DESC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

20
HJGL_ZH/FineUIPro.Web/ContinuousPrint/CommissionRepairPrint.aspx.cs
View File

@ -67,11 +67,21 @@ namespace FineUIPro.Web.ContinuousPrint
} }
} }
string strSql = @"select a.CH_RepairID,a.TrustItemID,a.Record_PrintDate,a.CH_RepairNo,a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate from HJGL_CH_Repair as a inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId= @ProjectId" + str; string strSql = @"select a.CH_RepairID,a.TrustItemID,a.Record_PrintDate,a.CH_RepairNo,a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate
from HJGL_CH_Repair as a
inner join Base_Project as b on a.ProjectId=b.ProjectId
where a.ProjectId= @ProjectId" + str;
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -107,10 +117,12 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

4
HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -73,7 +73,7 @@
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="HardTestReportId" AllowSorting="true" SortField="HardTestReportId" DataKeyNames="HardTestReportId" AllowSorting="true" SortField="HardTestReportId"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

16
HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs
View File

@ -57,7 +57,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -93,10 +100,13 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

4
HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessTestReportPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -76,7 +76,7 @@
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

17
HJGL_ZH/FineUIPro.Web/ContinuousPrint/HardnessTestReportPrint.aspx.cs
View File

@ -58,7 +58,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -94,10 +101,14 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

4
HJGL_ZH/FineUIPro.Web/ContinuousPrint/PipingSingleDiagramPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -73,7 +73,7 @@
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

16
HJGL_ZH/FineUIPro.Web/ContinuousPrint/PipingSingleDiagramPrint.aspx.cs
View File

@ -57,7 +57,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -93,10 +100,13 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

2
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"

14
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs
View File

@ -2,6 +2,7 @@
using NPOI.OpenXmlFormats.Wordprocessing; using NPOI.OpenXmlFormats.Wordprocessing;
using NPOI.SS.UserModel; using NPOI.SS.UserModel;
using NPOI.SS.Util; using NPOI.SS.Util;
using NPOI.Util;
using NPOI.XSSF.UserModel; using NPOI.XSSF.UserModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -69,7 +70,7 @@ namespace FineUIPro.Web.ContinuousPrint
} }
} }
str += " ORDER BY a.CH_TrustDate DESC"; //str += " ORDER BY a.CH_TrustDate DESC";
string strSql = @"select a.CH_TrustID,a.CH_TrustCode,a.CH_TrustDate,a.CH_Printer, string strSql = @"select a.CH_TrustID,a.CH_TrustCode,a.CH_TrustDate,a.CH_Printer,
a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate a.CH_PrintDate,b.ProjectCode,b.ProjectName,b.ShortName,b.StartDate,b.EndDate
@ -79,7 +80,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -115,8 +123,6 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }

16
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestRecordtPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -73,7 +73,7 @@
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>
@ -112,22 +112,22 @@
FieldType="Date" Renderer="Date" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> FieldType="Date" Renderer="Date" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" <f:RenderField HeaderText="管线号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> SortField="ISO_IsoNo" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="JOT_JointNo" DataField="JOT_JointNo" <f:RenderField HeaderText="焊口号" ColumnID="JOT_JointNo" DataField="JOT_JointNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px"> SortField="JOT_JointNo" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="焊口规格" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc" <f:RenderField HeaderText="焊口规格" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> SortField="JOT_JointDesc" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="检测方法" ColumnID="NDT_Code" DataField="NDT_Code" <f:RenderField HeaderText="检测方法" ColumnID="NDT_Code" DataField="NDT_Code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px"> SortField="NDT_Code" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="打印人" ColumnID="Record_Printer" DataField="Record_Printer" <f:RenderField HeaderText="打印人" ColumnID="Record_Printer" DataField="Record_Printer"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px"> SortField="Record_Printer" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="打印时间" ColumnID="Record_PrintDate" DataField="Record_PrintDate" <f:RenderField HeaderText="打印时间" ColumnID="Record_PrintDate" DataField="Record_PrintDate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> SortField="Record_PrintDate" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
</f:Grid> </f:Grid>

16
HJGL_ZH/FineUIPro.Web/ContinuousPrint/TestRecordtPrint.aspx.cs
View File

@ -130,7 +130,14 @@ namespace FineUIPro.Web.ContinuousPrint
LEFT JOIN HJGL_BS_NDTType AS ndt ON ndt.NDT_ID = v.CH_NDTMethod LEFT JOIN HJGL_BS_NDTType AS ndt ON ndt.NDT_ID = v.CH_NDTMethod
LEFT JOIN Base_Project AS project ON project.ProjectId = v.ProjectId"; LEFT JOIN Base_Project AS project ON project.ProjectId = v.ProjectId";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -166,10 +173,13 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

6
HJGL_ZH/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -72,8 +72,8 @@
Title="底部面板" ShowBorder="false" ShowHeader="false" Layout="Fit"> Title="底部面板" ShowBorder="false" ShowHeader="false" Layout="Fit">
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" AllowSorting="true" SortField="VICheckDate"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

15
HJGL_ZH/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
View File

@ -66,7 +66,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
} }
@ -102,10 +109,12 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

4
HJGL_ZH/FineUIPro.Web/ContinuousPrint/WeldingRecordPrint.aspx
View File

@ -16,7 +16,7 @@
Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox"> Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="false" runat="server"
BoxFlex="1" DataKeyNames="ID" AllowCellEditing="true" DataIDField="ProjectId" BoxFlex="1" DataKeyNames="ID" DataIDField="ProjectId"
AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort" AllowSorting="true" SortField="ProjectId" SortDirection="DESC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowSelectEvent="true" EnableRowClickEvent="true" EnableRowSelectEvent="true" EnableRowClickEvent="true"
@ -73,7 +73,7 @@
<Items> <Items>
<f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server" <f:Grid ID="Grid2" CssClass="blockpanel" ShowBorder="true" ShowHeader="true" EnableCollapse="false" runat="server"
DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID" DataKeyNames="ISO_ID" AllowSorting="true" SortField="ISO_ID"
SortDirection="ASC" EnableCheckBoxSelect="true"> SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
<Items> <Items>

15
HJGL_ZH/FineUIPro.Web/ContinuousPrint/WeldingRecordPrint.aspx.cs
View File

@ -51,7 +51,14 @@ namespace FineUIPro.Web.ContinuousPrint
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId)); listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
Grid2.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
DataView view = dt.DefaultView;
if (!string.IsNullOrEmpty(Grid2.SortField) && view.Count > 0)
{
view.Sort = String.Format("{0} {1}", Grid2.SortField, Grid2.SortDirection);
}
DataTable table = view.ToTable();
Grid2.DataSource = table;
Grid2.DataBind(); Grid2.DataBind();
Grid2.SelectAllRows(); Grid2.SelectAllRows();
@ -88,10 +95,12 @@ namespace FineUIPro.Web.ContinuousPrint
/// <param name="e"></param> /// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{ {
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid(); BindGrid();
} }
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid1(this.Grid1.SelectedRowID);
}
#endregion #endregion
#region 选择加载 #region 选择加载

8
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1115,6 +1115,7 @@
<Content Include="HJGL\TrustManage\TrustManageItemEdit.aspx" /> <Content Include="HJGL\TrustManage\TrustManageItemEdit.aspx" />
<Content Include="HJGL\WeldingManage\CompleteReportDateEdit.aspx" /> <Content Include="HJGL\WeldingManage\CompleteReportDateEdit.aspx" />
<Content Include="HJGL\WeldingManage\DetectionPoint.aspx" /> <Content Include="HJGL\WeldingManage\DetectionPoint.aspx" />
<Content Include="HJGL\WeldingManage\JointInfoBatchModity.aspx" />
<Content Include="HJGL\WeldingManage\JointInfoOut.aspx" /> <Content Include="HJGL\WeldingManage\JointInfoOut.aspx" />
<Content Include="HJGL\WeldingManage\IsoInfoFrame.aspx" /> <Content Include="HJGL\WeldingManage\IsoInfoFrame.aspx" />
<Content Include="HJGL\WeldingManage\JointInfo.aspx" /> <Content Include="HJGL\WeldingManage\JointInfo.aspx" />
@ -5828,6 +5829,13 @@
<Compile Include="HJGL\WeldingManage\DetectionPoint.aspx.designer.cs"> <Compile Include="HJGL\WeldingManage\DetectionPoint.aspx.designer.cs">
<DependentUpon>DetectionPoint.aspx</DependentUpon> <DependentUpon>DetectionPoint.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="HJGL\WeldingManage\JointInfoBatchModity.aspx.cs">
<DependentUpon>JointInfoBatchModity.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\WeldingManage\JointInfoBatchModity.aspx.designer.cs">
<DependentUpon>JointInfoBatchModity.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\WeldingManage\JointInfoOut.aspx.cs"> <Compile Include="HJGL\WeldingManage\JointInfoOut.aspx.cs">
<DependentUpon>JointInfoOut.aspx</DependentUpon> <DependentUpon>JointInfoOut.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

19
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/MTReportEdit.aspx.cs
View File

@ -310,14 +310,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (mtReport != null) if (mtReport != null)
{ {
this.TestingReportPrintId = mtReport.TestingReportPrintId; this.TestingReportPrintId = mtReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(mtReport.ReportCode) && mtReport.ReportCode.Length > 3) //if (!string.IsNullOrEmpty(mtReport.ReportCode) && mtReport.ReportCode.Length > 3)
{ //{
this.txtMTReportCode.Text = mtReport.ReportCode.Substring(3);//报告编号 // this.txtMTReportCode.Text = mtReport.ReportCode.Substring(3);//报告编号
} //}
else //else
{ //{
// this.txtMTReportCode.Text = mtReport.ReportCode;
//}
this.txtMTReportCode.Text = mtReport.ReportCode; this.txtMTReportCode.Text = mtReport.ReportCode;
}
this.hdReportCode.Text = mtReport.ReportCode; this.hdReportCode.Text = mtReport.ReportCode;
this.txtSurfaceState.Text = mtReport.MT_SurfaceState;//表面状态 this.txtSurfaceState.Text = mtReport.MT_SurfaceState;//表面状态
@ -342,8 +343,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
} }
else else
{ {
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "MT-" + pro.TestEngineeringCode + "-"); this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-MT-");
this.txtMTReportCode.Text = this.hdReportCode.Text.Substring(3); this.txtMTReportCode.Text = this.hdReportCode.Text;
} }
BindGrid(); BindGrid();
} }

19
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PTReportEdit.aspx.cs
View File

@ -267,14 +267,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (ptReport != null) if (ptReport != null)
{ {
this.TestingReportPrintId = ptReport.TestingReportPrintId; this.TestingReportPrintId = ptReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(ptReport.ReportCode) && ptReport.ReportCode.Length > 3) //if (!string.IsNullOrEmpty(ptReport.ReportCode) && ptReport.ReportCode.Length > 3)
{ //{
this.txtPTReportCode.Text = ptReport.ReportCode.Substring(3);//报告编号 // this.txtPTReportCode.Text = ptReport.ReportCode.Substring(3);//报告编号
} //}
else //else
{ //{
// this.txtPTReportCode.Text = ptReport.ReportCode;
//}
this.txtPTReportCode.Text = ptReport.ReportCode; this.txtPTReportCode.Text = ptReport.ReportCode;
}
this.hdReportCode.Text = ptReport.ReportCode; this.hdReportCode.Text = ptReport.ReportCode;
//this.txtContractUnit.Text = ptReport.ContractUnitId;//承包单位 //this.txtContractUnit.Text = ptReport.ContractUnitId;//承包单位
@ -299,8 +300,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
} }
else else
{ {
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "PT-" + pro.TestEngineeringCode + "-"); this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-PT-");
this.txtPTReportCode.Text = this.hdReportCode.Text.Substring(3); this.txtPTReportCode.Text = this.hdReportCode.Text;
this.txtContractUnit.Text = "镇海石化建安工程有限公司"; this.txtContractUnit.Text = "镇海石化建安工程有限公司";
} }
BindGrid(); BindGrid();

25
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/RTReportEdit.aspx.cs
View File

@ -339,15 +339,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (rtReport != null) if (rtReport != null)
{ {
this.TestingReportPrintId = rtReport.TestingReportPrintId; this.TestingReportPrintId = rtReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3) //if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3)
{ //{
this.txtRTReportCode.Text = rtReport.ReportCode.Substring(3); // this.txtRTReportCode.Text = rtReport.ReportCode.Substring(3);
} //}
else //else
{ //{
this.txtRTReportCode.Text = rtReport.ReportCode; // this.txtRTReportCode.Text = rtReport.ReportCode;
} //}
this.txtRTReportCode.Text = rtReport.ReportCode;
this.hdReportCode.Text = rtReport.ReportCode; this.hdReportCode.Text = rtReport.ReportCode;
this.txtTechnicalGrade.Text = rtReport.RT_TechnicalGrade; this.txtTechnicalGrade.Text = rtReport.RT_TechnicalGrade;
@ -391,7 +392,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
else else
{ {
int maxCode = 0; int maxCode = 0;
string prefix = "RT-" + pro.TestEngineeringCode + "-"; string prefix = pro.TestEngineeringCode + "-RT-";
int prefixLeng = prefix.Length + 1; int prefixLeng = prefix.Length + 1;
string sqlstr = "SELECT MAX(CONVERT(INT, SUBSTRING(ReportCode,@prefixLeng,LEN(ReportCode)))) FROM HJGL_CH_TestingReportPrint WHERE ProjectId=@ProjectId AND ReportCode LIKE @prefix"; string sqlstr = "SELECT MAX(CONVERT(INT, SUBSTRING(ReportCode,@prefixLeng,LEN(ReportCode)))) FROM HJGL_CH_TestingReportPrint WHERE ProjectId=@ProjectId AND ReportCode LIKE @prefix";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
@ -406,13 +407,13 @@ namespace FineUIPro.Web.HJGL.CheckManage
} }
if (maxCode < 999) if (maxCode < 999)
{ {
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "RT-" + pro.TestEngineeringCode + "-"); this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-RT-");
} }
else else
{ {
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeThreeToFour", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "RT-" + pro.TestEngineeringCode + "-"); this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeThreeToFour", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-RT-");
} }
this.txtRTReportCode.Text = this.hdReportCode.Text.Substring(3); this.txtRTReportCode.Text = this.hdReportCode.Text;
this.txtTubeVoltage.Text = " kv"; this.txtTubeVoltage.Text = " kv";
} }
BindGrid(); BindGrid();

29
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/TestingReportPrint.aspx.cs
View File

@ -500,7 +500,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
string reportCode = string.Empty; string reportCode = string.Empty;
if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3) if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3)
{ {
reportCode = rtReport.ReportCode.Substring(3); //reportCode = rtReport.ReportCode.Substring(3);
reportCode = rtReport.ReportCode;
} }
string unitName = string.Empty; string unitName = string.Empty;
if (iso != null) if (iso != null)
@ -540,24 +541,24 @@ namespace FineUIPro.Web.HJGL.CheckManage
} }
if (ndtType.NDT_Code == "RT") if (ndtType.NDT_Code == "RT")
{ {
code = dateStr + "-RT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + (tb.Rows.Count - 1).ToString(); code = dateStr + "-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + (tb.Rows.Count - 1).ToString() + "-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - "))); PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
} }
else if (ndtType.NDT_Code == "PT") else
{ {
code = dateStr + "-PT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName; code = dateStr + "-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName + "-" + jointDesc + "-" + (tb.Rows.Count - 1).ToString();
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
else if (ndtType.NDT_Code == "MT")
{
code = dateStr + "-MT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
else if (ndtType.NDT_Code == "UT")
{
code = dateStr + "-UT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - "))); PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
} }
//else if (ndtType.NDT_Code == "MT")
//{
// code = dateStr + "-MT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
// PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
//}
//else if (ndtType.NDT_Code == "UT")
//{
// code = dateStr + "-UT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
// PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
//}
} }
else else
{ {

19
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/UTReportEdit.aspx.cs
View File

@ -316,14 +316,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (utReport != null) if (utReport != null)
{ {
this.TestingReportPrintId = utReport.TestingReportPrintId; this.TestingReportPrintId = utReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(utReport.ReportCode) && utReport.ReportCode.Length > 3) //if (!string.IsNullOrEmpty(utReport.ReportCode) && utReport.ReportCode.Length > 3)
{ //{
this.txtUTReportCode.Text = utReport.ReportCode.Substring(3);//报表编号 // this.txtUTReportCode.Text = utReport.ReportCode.Substring(3);//报表编号
} //}
else //else
{ //{
// this.txtUTReportCode.Text = utReport.ReportCode;
//}
this.txtUTReportCode.Text = utReport.ReportCode; this.txtUTReportCode.Text = utReport.ReportCode;
}
this.hdReportCode.Text = utReport.ReportCode; this.hdReportCode.Text = utReport.ReportCode;
//this.txtContractUnit.Text = utReport.ContractUnitId;//承包单位 //this.txtContractUnit.Text = utReport.ContractUnitId;//承包单位
@ -349,8 +350,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
} }
else else
{ {
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "UT-" + pro.TestEngineeringCode + "-"); this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-UT-");
this.txtUTReportCode.Text = this.hdReportCode.Text.Substring(3); this.txtUTReportCode.Text = this.hdReportCode.Text;
this.txtContractUnit.Text = "镇海石化建安工程有限公司"; this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtSurfaceState.Text = "机械打磨"; this.txtSurfaceState.Text = "机械打磨";
this.txtProbeType.Text = "2.5MHZ10×10K2"; this.txtProbeType.Text = "2.5MHZ10×10K2";

5
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx
View File

@ -57,6 +57,7 @@
<Items> <Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:DatePicker runat="server" Label="检测日期" ID="txtCheckDate" LabelWidth="100px"></f:DatePicker>
<f:Button ID="btnSave" Text="提交" ToolTip="提交硬度值" Icon="SystemSave" ValidateForms="SimpleForm1" runat="server" <f:Button ID="btnSave" Text="提交" ToolTip="提交硬度值" Icon="SystemSave" ValidateForms="SimpleForm1" runat="server"
OnClick="btnSave_Click"> OnClick="btnSave_Click">
</f:Button> </f:Button>
@ -146,6 +147,10 @@
</f:TextBox> </f:TextBox>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="检测日期" ColumnID="CheckDate" DataField="CheckDate"
SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID" FieldType="String" <f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID" FieldType="String"
Hidden="true"> Hidden="true">
</f:RenderField> </f:RenderField>

32
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.cs
View File

@ -320,7 +320,7 @@ where Item.ProjectId=@ProjectId and HardTestReportId is null ";
Grid1.RecordCount = tb.Rows.Count; Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
// 2.获取当前排序（如不分页要调用这个排序方法） // 2.获取当前排序（如不分页要调用这个排序方法）
//var table = this.GetSortTable(Grid1, tb); //var table = this.GetSortTable(Grid1, tb);
// 2.获取当前分页数据 // 2.获取当前分页数据
@ -378,7 +378,9 @@ where Item.ProjectId=@ProjectId and HardTestReportId is null ";
/// <param name="e"></param> /// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e) protected void btnSave_Click(object sender, EventArgs e)
{ {
JArray mergedData = Grid1.GetMergedData(); if (!string.IsNullOrEmpty(this.txtCheckDate.Text))
{
JArray mergedData = Grid1.GetModifiedData();//.GetMergedData();
string jot_id = string.Empty, hardTestReportId = string.Empty, hardTestReportItemId = string.Empty, hardTestReportItemId2 = string.Empty, hardTestReportItemId3 = string.Empty, isoidLog = string.Empty, jointIdLog = string.Empty; string jot_id = string.Empty, hardTestReportId = string.Empty, hardTestReportItemId = string.Empty, hardTestReportItemId2 = string.Empty, hardTestReportItemId3 = string.Empty, isoidLog = string.Empty, jointIdLog = string.Empty;
foreach (JObject mergedRow in mergedData) foreach (JObject mergedRow in mergedData)
{ {
@ -386,27 +388,35 @@ where Item.ProjectId=@ProjectId and HardTestReportId is null ";
JObject values = mergedRow.Value<JObject>("values"); JObject values = mergedRow.Value<JObject>("values");
int rowIndex = mergedRow.Value<int>("index"); int rowIndex = mergedRow.Value<int>("index");
jot_id = Grid1.DataKeys[rowIndex][3].ToString(); jot_id = Grid1.DataKeys[rowIndex][3].ToString();
hardTestReportItemId = Grid1.DataKeys[rowIndex][0].ToString(); hardTestReportItemId = Grid1.DataKeys[rowIndex][0] != null ? Grid1.DataKeys[rowIndex][0].ToString() : null;
hardTestReportItemId2 = Grid1.DataKeys[rowIndex][1].ToString(); hardTestReportItemId2 = Grid1.DataKeys[rowIndex][1] != null ? Grid1.DataKeys[rowIndex][1].ToString() : null;
hardTestReportItemId3 = Grid1.DataKeys[rowIndex][2].ToString(); hardTestReportItemId3 = Grid1.DataKeys[rowIndex][2] != null ? Grid1.DataKeys[rowIndex][2].ToString() : null;
Model.HJGL_PW_JointInfo joint = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(jot_id); Model.HJGL_PW_JointInfo joint = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(jot_id);
Model.HJGL_PW_IsoInfo iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(joint.ISO_ID); Model.HJGL_PW_IsoInfo iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(joint.ISO_ID);
Model.HJGL_CH_HardTestReportItem item1 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId); Model.HJGL_CH_HardTestReportItem item1 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId);
item1.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue1").ToString()); item1.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue1"));
item1.Remark = values.Value<string>("Remark").ToString(); item1.Remark = values.Value<string>("Remark") != null ? values.Value<string>("Remark").ToString() : null;
item1.CheckDate = Convert.ToDateTime(txtCheckDate.Text);
BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item1); BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item1);
Model.HJGL_CH_HardTestReportItem item2 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId2); Model.HJGL_CH_HardTestReportItem item2 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId2);
item2.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue2").ToString()); item2.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue2"));
item2.Remark = values.Value<string>("Remark").ToString(); item2.Remark = values.Value<string>("Remark") != null ? values.Value<string>("Remark").ToString() : null;
item2.CheckDate = Convert.ToDateTime(txtCheckDate.Text);
BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item2); BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item2);
Model.HJGL_CH_HardTestReportItem item3 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId3); Model.HJGL_CH_HardTestReportItem item3 = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportItemByID(hardTestReportItemId3);
item3.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue3").ToString()); item3.HardNessValue = Funs.GetNewInt(values.Value<string>("HardNessValue3"));
item3.Remark = values.Value<string>("Remark").ToString(); item3.Remark = values.Value<string>("Remark") != null ? values.Value<string>("Remark").ToString() : null;
item3.CheckDate = Convert.ToDateTime(txtCheckDate.Text);
BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item3); BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReportItem(item3);
} }
ShowNotify("提交成功！", MessageBoxIcon.Success); ShowNotify("提交成功！", MessageBoxIcon.Success);
BindGrid(); BindGrid();
} }
else
{
ShowNotify("请选择检测日期！", MessageBoxIcon.Warning);
}
}
#endregion #endregion
} }
} }

15
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.HotHardManage { namespace FineUIPro.Web.HJGL.HotHardManage
{
public partial class HardReportSet { public partial class HardReportSet
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -102,6 +104,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1; protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary> /// <summary>
/// btnSave 控件。 /// btnSave 控件。
/// </summary> /// </summary>

6
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReportEdit.aspx
View File

@ -105,6 +105,12 @@
</f:TextBox> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="32% 34% 34%">
<Items>
<f:TextBox ID="txtExecStandard" Label="执行标准" runat="server" LabelWidth="80px">
</f:TextBox>
</Items>
</f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
</Items> </Items>

19
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReportEdit.aspx.cs
View File

@ -101,6 +101,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{ {
this.ProjectId = trust.ProjectId; this.ProjectId = trust.ProjectId;
this.txtHardTestReportCode.Text = trust.HardTestReportCode; this.txtHardTestReportCode.Text = trust.HardTestReportCode;
string execStandard = string.Empty;
if (!string.IsNullOrEmpty(trust.TrustUnitId)) if (!string.IsNullOrEmpty(trust.TrustUnitId))
{ {
this.drpUnit.SelectedValue = trust.TrustUnitId; this.drpUnit.SelectedValue = trust.TrustUnitId;
@ -124,6 +125,14 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.ddlSTE.SelectedValue = trust.STE_ID; this.ddlSTE.SelectedValue = trust.STE_ID;
this.txtMaterialStandard.Text = steel2.HardQuaStandard; this.txtMaterialStandard.Text = steel2.HardQuaStandard;
} }
if(!string.IsNullOrEmpty(isoInfo.ISO_Executive))
{
var exec = BLL.HJGL_ExecStandardService.GetExecStandardById(isoInfo.ISO_Executive);
if (exec != null)
{
execStandard = exec.ExecStandardName;
}
}
} }
} }
this.txtContractUnit.Text = trust.ContractUnit; this.txtContractUnit.Text = trust.ContractUnit;
@ -149,6 +158,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{ {
this.txtTestCount.Text = trust.TestCount.ToString(); this.txtTestCount.Text = trust.TestCount.ToString();
} }
if (!string.IsNullOrEmpty(trust.ExecStandard))
{
txtExecStandard.Text = trust.ExecStandard;
}
else
{
txtExecStandard.Text = execStandard;
}
} }
else else
{ {
@ -255,6 +273,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
} }
newHardTestReport.TestRate = this.txtTestRate.Text.Trim(); newHardTestReport.TestRate = this.txtTestRate.Text.Trim();
newHardTestReport.TestCount = Funs.GetNewIntOrZero(this.txtTestCount.Text.Trim()); newHardTestReport.TestCount = Funs.GetNewIntOrZero(this.txtTestCount.Text.Trim());
newHardTestReport.ExecStandard = this.txtExecStandard.Text.Trim();
BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReport(newHardTestReport); BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReport(newHardTestReport);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, newHardTestReport.ProjectId, this.CurrUser.UserId, "修改硬度检测报告信息"); BLL.Sys_LogService.AddLog(BLL.Const.System_3, newHardTestReport.ProjectId, this.CurrUser.UserId, "修改硬度检测报告信息");
} }

15
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HardTestReportEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.HotHardManage { namespace FineUIPro.Web.HJGL.HotHardManage
{
public partial class HardTestReportEdit { public partial class HardTestReportEdit
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -228,6 +230,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtTestCount; protected global::FineUIPro.TextBox txtTestCount;
/// <summary>
/// txtExecStandard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtExecStandard;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 控件。
/// </summary> /// </summary>

14
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
View File

@ -58,6 +58,8 @@
</f:Button> </f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" runat="server" OnClick="btnBatchAdd_Click"> <f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" runat="server" OnClick="btnBatchAdd_Click">
</f:Button> </f:Button>
<f:Button ID="btnBatchModity" Text="批量修改" Icon="TableEdit" runat="server" OnClick="btnBatchModity_Click">
</f:Button>
<f:Button ID="btnOut" runat="server" Text="导出" Icon="FolderUp" OnClick="btnOut_Click"> <f:Button ID="btnOut" runat="server" Text="导出" Icon="FolderUp" OnClick="btnOut_Click">
</f:Button> </f:Button>
<f:Button ID="btnFileName" Text="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click"> <f:Button ID="btnFileName" Text="文档名" Icon="TableEdit" runat="server" OnClick="btnFileName_Click">
@ -102,12 +104,13 @@
</Toolbars> </Toolbars>
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="JOT_ID" AllowCellEditing="true" AllowColumnLocking="true" runat="server" BoxFlex="1" DataKeyNames="JOT_ID" AllowColumnLocking="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="JOT_ID" AllowSorting="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="JOT_ID" AllowSorting="true"
SortField="Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" SortField="Sort1,Sort2,Sort3,Sort4,Sort5" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true" EnableTextSelection="True" AutoScroll="true" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound"> OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound"
EnableCheckBoxSelect="true" EnableMultiSelect="true">
<Columns> <Columns>
<%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" <%--<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center"
TextAlign="Center" />--%> TextAlign="Center" />--%>
@ -300,6 +303,10 @@
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window8_Close" Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window8_Close"
Width="600px" Height="300px"> Width="600px" Height="300px">
</f:Window> </f:Window>
<f:Window ID="Window9" Title="批量修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="550px">
</f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
@ -308,6 +315,9 @@
<f:MenuButton ID="btnMenuUpdate" OnClick="btnMenuUpdate_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuUpdate" OnClick="btnMenuUpdate_Click" EnablePostBack="true"
runat="server" Text="更改日报信息" Icon="TableEdit"> runat="server" Text="更改日报信息" Icon="TableEdit">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuSync" OnClick="btnMenuSync_Click" EnablePostBack="true"
runat="server" Text="试压包号同步">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete"> ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
</f:MenuButton> </f:MenuButton>

62
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
View File

@ -357,6 +357,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
protected void btnBatchModity_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnModify))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
string jotIdList = string.Join(",", Grid1.SelectedRowIDArray);
PageContext.RegisterStartupScript(Window9.GetShowReference(String.Format("JointInfoBatchModity.aspx?jotIdList={0}", jotIdList, "批量修改 - ")));
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
/// <summary> /// <summary>
/// 焊口信息编辑 /// 焊口信息编辑
/// </summary> /// </summary>
@ -405,6 +424,49 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
/// <summary>
/// 试压包号同步
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuSync_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_PipelineManageMenuId, BLL.Const.BtnSync))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
string isoId = tvControlItem.SelectedNodeID;
var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(isoId);
if (!string.IsNullOrEmpty(iso.PressureTestPackageNo))
{
var jotIdList = Grid1.SelectedRowIDArray;
foreach (string jotId in jotIdList)
{
Model.SGGLDB db = Funs.DB;
Model.HJGL_PW_JointInfo newJointInfo = db.HJGL_PW_JointInfo.FirstOrDefault(x => x.JOT_ID == jotId);
if (newJointInfo != null)
{
newJointInfo.PressureTestPackageNo = iso.PressureTestPackageNo;
db.SubmitChanges();
}
}
}
else
{
Alert.ShowInTop("该管线的试压包号为空，不能同步！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
/// <summary> /// <summary>
/// 删除按钮 /// 删除按钮
/// </summary> /// </summary>

33
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class JointInfo { public partial class JointInfo
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。
@ -138,6 +140,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnBatchAdd; protected global::FineUIPro.Button btnBatchAdd;
/// <summary>
/// btnBatchModity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnBatchModity;
/// <summary> /// <summary>
/// btnOut 控件。 /// btnOut 控件。
/// </summary> /// </summary>
@ -381,6 +392,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.Window Window8; protected global::FineUIPro.Window Window8;
/// <summary>
/// Window9 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window9;
/// <summary> /// <summary>
/// Menu1 控件。 /// Menu1 控件。
/// </summary> /// </summary>
@ -408,6 +428,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.MenuButton btnMenuUpdate; protected global::FineUIPro.MenuButton btnMenuUpdate;
/// <summary>
/// btnMenuSync 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuSync;
/// <summary> /// <summary>
/// btnMenuDelete 控件。 /// btnMenuDelete 控件。
/// </summary> /// </summary>

156
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchModity.aspx Normal file
View File

@ -0,0 +1,156 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JointInfoBatchModity.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.JointInfoBatchModity" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>焊口信息</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Label ID="txtJointNoS" runat="server" Label="修改的焊口" LabelAlign="Right">
</f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpInstallationId" Label="装置" runat="server" EnableEdit="true"
ShowRedStar="true" Required="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlSTE1" Label="材质1" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="ddlSTE1_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="ddlSTE2" Label="材质2" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlWLO_CODE" Label="焊接区域" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlJOTY_ID" Label="焊缝类型" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="ddlJOTY_ID_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="ddlJST_ID" Label="坡口类型" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlJointAttribute" Label="焊口属性" runat="server" ShowRedStar="true"
Required="true" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlWME_ID" Label="焊接方法" runat="server" ShowRedStar="true" Required="true"
EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtDia" Label="外径" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true" ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="txtText_TextChanged">
</f:NumberBox>
<f:NumberBox ID="txtSize" Label="寸径" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true" ShowRedStar="true" Required="true">
</f:NumberBox>
<f:NumberBox ID="txtSch" Label="壁厚" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true" ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="txtText_TextChanged">
</f:NumberBox>
<f:TextBox ID="txtJointDesc" Label="焊口规格" ShowRedStar="true" Required="true" runat="server"
LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtLastTemp" Label="后热温度" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtCellTemp" Label="层间温度" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true">
</f:NumberBox>
<f:NumberBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true">
</f:NumberBox>
<f:TextBox ID="txtElectricity" Label="焊接电流" runat="server" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpIsSpecial" Label="是否特殊" runat="server" LabelWidth="100px">
<f:ListItem Value="0" Text="否" />
<f:ListItem Value="1" Text="是" />
</f:DropDownList>
<f:DropDownList ID="drpNDTR_ID" runat="server" Label="探伤比例" LabelWidth="100px" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpJOT_QualifiedLevel" runat="server" Label="合格等级" LabelWidth="100px"
EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtHardQuaStandard" runat="server" Label="硬度合格标准" LabelWidth="100px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlWeldSilk" Label="焊丝" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlWeldMat" Label="焊条" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="drpIS_Proess" Label="是否热处理" runat="server" LabelWidth="100px"
AutoPostBack="true" OnSelectedIndexChanged="drpIS_Proess_SelectedIndexChanged">
<f:ListItem Value="0" Text="否" />
<f:ListItem Value="1" Text="是" />
</f:DropDownList>
<f:DropDownBox runat="server" Label="热处理类型" ID="drpProessTypes" DataControlID="RadioButtonList1"
EnableMultiSelect="true" Required="true" ShowRedStar="true" LabelAlign="Right"
LabelWidth="100px" Hidden="true">
<PopPanel>
<f:SimpleForm ID="SimpleForm3" BodyPadding="10px" runat="server" AutoScroll="true"
ShowBorder="True" ShowHeader="false" Hidden="true">
<Items>
<f:Label ID="Label10" runat="server" Text="请选择热处理类型：">
</f:Label>
<f:CheckBoxList ID="RadioButtonList1" ColumnNumber="1" runat="server">
<f:CheckItem Value="1" Text="预热" />
<f:CheckItem Value="2" Text="消氢" />
<f:CheckItem Value="3" Text="后热" />
<f:CheckItem Value="4" Text="消应力热处理" />
<f:CheckItem Value="5" Text="稳定化处理" />
</f:CheckBoxList>
</Items>
</f:SimpleForm>
</PopPanel>
</f:DropDownBox>
<f:Label runat="server" ID="lb1">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50%">
<Items>
<f:TextBox ID="txtPressureTestPackageNo" Label="试压包号" runat="server" LabelWidth="100px">
</f:TextBox>
<f:NumberBox ID="txtWeldL" Label="非常规焊缝:L(mm)" runat="server" LabelWidth="100px"
AutoPostBack="true" OnTextChanged="txtWeldL_TextChanged" NoDecimal="true" NoNegative="true">
</f:NumberBox>
<f:Label ID="lbDef" runat="server" Label="备注" Text="非常规焊缝：仅限于支架、横缝、纵缝、环缝等焊口。非上述焊口请保持空白"></f:Label>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>

601
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchModity.aspx.cs Normal file
View File

@ -0,0 +1,601 @@
using BLL;
using FineUIPro.Web.HJGL.DataIn;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class JointInfoBatchModity : PageBase
{
#region 定义项
/// <summary>
/// 管线主键
/// </summary>
private string ISO_ID
{
get
{
return (string)ViewState["ISO_ID"];
}
set
{
ViewState["ISO_ID"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
///初始化下拉框
this.LoadDropDownList();
///初始化显示信息
this.LoadShowInfo();
}
}
#region 初始化页面信息
#region 加载下拉框
/// <summary>
/// 加载下拉框
/// </summary>
private void LoadDropDownList()
{
///材质1
this.ddlSTE1.DataTextField = "STE_Code";
this.ddlSTE1.DataValueField = "STE_ID";
this.ddlSTE1.DataSource = BLL.HJGL_MaterialService.GetSteelList();
this.ddlSTE1.DataBind();
Funs.FineUIPleaseSelect(this.ddlSTE1);
///材质2
this.ddlSTE2.DataTextField = "STE_Code";
this.ddlSTE2.DataValueField = "STE_ID";
this.ddlSTE2.DataSource = BLL.HJGL_MaterialService.GetSteelList();
this.ddlSTE2.DataBind();
Funs.FineUIPleaseSelect(this.ddlSTE2);
///焊缝类型
this.ddlJOTY_ID.DataTextField = "JOTY_Name";
this.ddlJOTY_ID.DataValueField = "JOTY_ID";
this.ddlJOTY_ID.DataSource = BLL.HJGL_WeldService.GetJointTypeNameList("2");
this.ddlJOTY_ID.DataBind();
Funs.FineUIPleaseSelect(this.ddlJOTY_ID);
///坡口类型
this.ddlJST_ID.DataTextField = "JST_Name";
this.ddlJST_ID.DataValueField = "JST_ID";
this.ddlJST_ID.DataSource = BLL.HJGL_GrooveService.GetSlopeTypeNameList();
this.ddlJST_ID.DataBind();
Funs.FineUIPleaseSelect(this.ddlJST_ID);
///焊口属性
this.ddlJointAttribute.DataTextField = "Text";
this.ddlJointAttribute.DataValueField = "Value";
this.ddlJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttributeItem();
this.ddlJointAttribute.DataBind();
Funs.FineUIPleaseSelect(this.ddlJointAttribute);
///焊接方法
this.ddlWME_ID.DataTextField = "WME_Name";
this.ddlWME_ID.DataValueField = "WME_ID";
this.ddlWME_ID.DataSource = BLL.HJGL_WeldingMethodService.GetWeldMethodNameList();
this.ddlWME_ID.DataBind();
Funs.FineUIPleaseSelect(this.ddlWME_ID);
///焊接区域
this.ddlWLO_CODE.DataTextField = "Text";
this.ddlWLO_CODE.DataValueField = "Value";
this.ddlWLO_CODE.DataSource = BLL.DropListService.HJGL_WLO_CODEItem();
this.ddlWLO_CODE.DataBind();
Funs.FineUIPleaseSelect(this.ddlWLO_CODE);
this.drpInstallationId.DataTextField = "Text";
this.drpInstallationId.DataValueField = "Value";
this.drpInstallationId.DataSource = BLL.Project_InstallationService.GetInstallationList(this.CurrUser.LoginProjectId);
this.drpInstallationId.DataBind();
Funs.FineUIPleaseSelect(this.drpInstallationId);
//探伤比例
this.drpNDTR_ID.DataTextField = "NDTR_Name";
this.drpNDTR_ID.DataValueField = "NDTR_ID";
this.drpNDTR_ID.DataSource = BLL.HJGL_DetectionService.GetNDTRateNameList();
this.drpNDTR_ID.DataBind();
Funs.FineUIPleaseSelect(this.drpNDTR_ID);
//合格等级
this.drpJOT_QualifiedLevel.DataTextField = "Text";
this.drpJOT_QualifiedLevel.DataValueField = "Value";
this.drpJOT_QualifiedLevel.DataSource = BLL.DropListService.HJGL_NDTClassItem();
this.drpJOT_QualifiedLevel.DataBind();
Funs.FineUIPleaseSelect(this.drpJOT_QualifiedLevel);
///焊丝
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
this.ddlWeldSilk.DataValueField = "WMT_ID";
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
///焊条
this.ddlWeldMat.DataTextField = "WMT_MatCode";
this.ddlWeldMat.DataValueField = "WMT_ID";
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldMat);
}
#endregion
#region 加载页面显示信息
/// <summary>
/// 加载页面显示信息
/// </summary>
private void LoadShowInfo()
{
string jotIdStr = Request.Params["jotIdList"];
if (!string.IsNullOrEmpty(jotIdStr))
{
var jotIdList= jotIdStr.Split(',');
txtJointNoS.Text=BLL.HJGL_PW_JointInfoService.ConvertJointCodeString(jotIdStr);
var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(jotIdList[0]);
this.ISO_ID = jointInfo.ISO_ID;
if (jointInfo != null)
{
this.txtJointDesc.Text = jointInfo.JOT_JointDesc;
if (!string.IsNullOrEmpty(jointInfo.DReportID))
{
this.drpNDTR_ID.Enabled = false;
}
if (!string.IsNullOrEmpty(jointInfo.STE_ID))
{
this.ddlSTE1.SelectedValue = jointInfo.STE_ID;
var ste = BLL.HJGL_MaterialService.GetSteelBySteID(jointInfo.STE_ID);
if (ste != null)
{
this.txtHardQuaStandard.Text = ste.HardQuaStandard;
}
}
if (!string.IsNullOrEmpty(jointInfo.STE_ID2))
{
this.ddlSTE2.SelectedValue = jointInfo.STE_ID2;
}
if (!string.IsNullOrEmpty(jointInfo.JOTY_ID))
{
this.ddlJOTY_ID.SelectedValue = jointInfo.JOTY_ID;
}
if (!string.IsNullOrEmpty(jointInfo.JST_ID))
{
this.ddlJST_ID.SelectedValue = jointInfo.JST_ID;
}
if (!string.IsNullOrEmpty(jointInfo.JOT_JointAttribute))
{
this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute;
}
if (!string.IsNullOrEmpty(jointInfo.WME_ID))
{
this.ddlWME_ID.SelectedValue = jointInfo.WME_ID;
}
this.txtSize.Text = Convert.ToString(jointInfo.JOT_Size);
this.txtSch.Text = jointInfo.JOT_Sch;
if (jointInfo.JOT_Dia != null)
{
this.txtDia.Text = Convert.ToString(jointInfo.JOT_Dia);
}
//this.txtFactSch.Text = Convert.ToString(jointInfo.JOT_FactSch);
if (!string.IsNullOrEmpty(jointInfo.WLO_Code))
{
this.ddlWLO_CODE.SelectedValue = jointInfo.WLO_Code;
}
this.txtLastTemp.Text = Convert.ToString(jointInfo.JOT_LastTemp);
this.txtCellTemp.Text = Convert.ToString(jointInfo.JOT_CellTemp);
this.txtPrepareTemp.Text = Convert.ToString(jointInfo.JOT_PrepareTemp);
if (!string.IsNullOrEmpty(jointInfo.JOT_WeldSilk))
{
this.ddlWeldSilk.SelectedValue = jointInfo.JOT_WeldSilk;
}
if (jointInfo.WeldL != null)
{
this.txtWeldL.Text = jointInfo.WeldL.ToString();
}
if (!string.IsNullOrEmpty(jointInfo.JOT_WeldMat))
{
this.ddlWeldMat.SelectedValue = jointInfo.JOT_WeldMat;
}
this.txtElectricity.Text = jointInfo.JOT_Electricity;
if (!string.IsNullOrEmpty(jointInfo.IS_Proess))
{
this.drpIS_Proess.SelectedValue = jointInfo.IS_Proess;
if (jointInfo.IS_Proess == "1")
{
this.drpProessTypes.Hidden = false;
//this.lbl.Hidden = true;
if (!string.IsNullOrEmpty(jointInfo.ProessTypes))
{
string[] proessTypes = jointInfo.ProessTypes.Split('|');
this.drpProessTypes.Values = proessTypes;
}
}
}
if (jointInfo.IsSpecial == true)
{
this.drpIsSpecial.SelectedValue = "1";
}
else
{
this.drpIsSpecial.SelectedValue = "0";
}
if (!string.IsNullOrEmpty(jointInfo.InstallationId))
{
this.drpInstallationId.SelectedValue = jointInfo.InstallationId;
}
if (!string.IsNullOrEmpty(jointInfo.NDTR_ID))
{
this.drpNDTR_ID.SelectedValue = jointInfo.NDTR_ID;
}
if (!string.IsNullOrEmpty(jointInfo.JOT_QualifiedLevel))
{
this.drpJOT_QualifiedLevel.SelectedValue = jointInfo.JOT_QualifiedLevel;
}
this.txtPressureTestPackageNo.Text = jointInfo.PressureTestPackageNo;
}
}
}
#endregion
#endregion
#region 提交按钮
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HJGL_JointInfoMenuId, Const.BtnSave))
{
if (this.drpInstallationId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择装置", MessageBoxIcon.Warning);
return;
}
if (this.ddlSTE1.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择材质1", MessageBoxIcon.Warning);
return;
}
if (this.ddlJOTY_ID.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择焊缝类型！", MessageBoxIcon.Warning);
return;
}
if (this.ddlJST_ID.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择坡口类型！", MessageBoxIcon.Warning);
return;
}
if (this.ddlJointAttribute.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择焊口属性！", MessageBoxIcon.Warning);
return;
}
if (this.ddlWME_ID.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择焊接方法！", MessageBoxIcon.Warning);
return;
}
string jotIdStr = Request.Params["jotIdList"];
if (!string.IsNullOrEmpty(jotIdStr))
{
Model.SGGLDB db = Funs.DB;
var jotIdList = jotIdStr.Split(',');
foreach (var jotId in jotIdList)
{
Model.HJGL_PW_JointInfo newJointInfo = db.HJGL_PW_JointInfo.FirstOrDefault(x => x.JOT_ID == jotId);
var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == jotId select x;
var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(jotId);
if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId)
{
newJointInfo.JOT_PrepareTemp = Funs.GetNewDecimal(this.txtPrepareTemp.Text);
newJointInfo.PressureTestPackageNo = this.txtPressureTestPackageNo.Text;
if (this.drpIS_Proess.SelectedValue != BLL.Const._Null)
{
newJointInfo.IS_Proess = this.drpIS_Proess.SelectedValue;
if (this.drpIS_Proess.SelectedValue == "1")
{
if (drpProessTypes.Values.Length > 0)
{
newJointInfo.ProessTypes = String.Join("|", drpProessTypes.Values);
}
else
{
Alert.ShowInTop("请选择热处理类型！", MessageBoxIcon.Warning);
return;
}
}
}
BLL.HJGL_PW_JointInfoService.UpdateJointInfo(newJointInfo);
}
else
{
newJointInfo.JOT_JointDesc = this.txtJointDesc.Text.Trim();
if (this.ddlSTE1.SelectedValue != BLL.Const._Null)
{
newJointInfo.STE_ID = this.ddlSTE1.SelectedValue;
}
if (this.ddlSTE2.SelectedValue != BLL.Const._Null)
{
newJointInfo.STE_ID2 = this.ddlSTE2.SelectedValue;
}
if (this.ddlJOTY_ID.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOTY_ID = this.ddlJOTY_ID.SelectedValue;
}
if (this.ddlJST_ID.SelectedValue != BLL.Const._Null)
{
newJointInfo.JST_ID = this.ddlJST_ID.SelectedValue;
}
if (this.ddlJointAttribute.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_JointAttribute = this.ddlJointAttribute.SelectedValue;
}
if (this.ddlWME_ID.SelectedValue != BLL.Const._Null)
{
newJointInfo.WME_ID = this.ddlWME_ID.SelectedValue;
}
if (this.drpInstallationId.SelectedValue != BLL.Const._Null)
{
newJointInfo.InstallationId = this.drpInstallationId.SelectedValue;
}
newJointInfo.JOT_Size = Funs.GetNewDecimal(this.txtSize.Text);
newJointInfo.JOT_Dia = Funs.GetNewDecimal(this.txtDia.Text);
newJointInfo.JOT_Sch = this.txtSch.Text.Trim();
newJointInfo.JOT_TrustFlag = "00";
newJointInfo.JOT_CheckFlag = "00";
newJointInfo.JOT_JointStatus = "100";
if (this.ddlWLO_CODE.SelectedValue != BLL.Const._Null)
{
newJointInfo.WLO_Code = this.ddlWLO_CODE.SelectedValue;
}
if (this.drpNDTR_ID.SelectedValue != BLL.Const._Null)
{
if (string.IsNullOrEmpty(newJointInfo.DReportID))
{
newJointInfo.NDTR_ID = this.drpNDTR_ID.SelectedValue;
}
}
if (this.drpJOT_QualifiedLevel.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_QualifiedLevel = this.drpJOT_QualifiedLevel.SelectedValue;
}
newJointInfo.JOT_LastTemp = Funs.GetNewDecimal(this.txtLastTemp.Text);
newJointInfo.JOT_CellTemp = Funs.GetNewDecimal(this.txtCellTemp.Text);
newJointInfo.JOT_PrepareTemp = Funs.GetNewDecimal(this.txtPrepareTemp.Text);
newJointInfo.JOT_Electricity = this.txtElectricity.Text.Trim();
newJointInfo.PressureTestPackageNo = this.txtPressureTestPackageNo.Text;
if (this.drpIsSpecial.SelectedValue == "1")
{
newJointInfo.IsSpecial = true;
}
else
{
newJointInfo.IsSpecial = false;
}
if (this.drpIS_Proess.SelectedValue != BLL.Const._Null)
{
newJointInfo.IS_Proess = this.drpIS_Proess.SelectedValue;
if (this.drpIS_Proess.SelectedValue == "1")
{
if (drpProessTypes.Values.Length > 0)
{
newJointInfo.ProessTypes = String.Join("|", drpProessTypes.Values);
}
else
{
Alert.ShowInTop("请选择热处理类型！", MessageBoxIcon.Warning);
return;
}
}
}
if (this.ddlWeldSilk.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_WeldSilk = this.ddlWeldSilk.SelectedValue;
}
if (this.ddlWeldMat.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_WeldMat = this.ddlWeldMat.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtWeldL.Text))
{
newJointInfo.WeldL = Convert.ToInt32(this.txtWeldL.Text);
}
if (newJointInfo.DReportID != null)
{
BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(jotId, this.ddlJointAttribute.SelectedValue, Const.BtnModify);
}
BLL.HJGL_PW_JointInfoService.UpdateJointInfo(newJointInfo);
}
}
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
ShowNotify("提交成功！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
#endregion
#region 根据寸经外径对照表，输入外径是自动得到寸径；焊口规格：Φ外径*壁厚
/// <summary>
/// 根据寸经外径对照表，输入外径是自动得到寸径；焊口规格：Φ外径*壁厚
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtText_TextChanged(object sender, EventArgs e)
{
//根据寸经外径对照表，输入外径是自动得到寸径
if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()))
{
decimal dia = Funs.GetNewDecimalOrZero(this.txtDia.Text.Trim());
if (dia >= 500)
{
this.drpIsSpecial.SelectedValue = "1";
}
var inch = HJGL_ControlService.GetSizeByDia(dia);
if (inch != null)
{
this.txtSize.Text = Convert.ToString(inch);
}
}
//焊口规格：Φ外径*壁厚
if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()) && !string.IsNullOrEmpty(this.txtSch.Text.Trim()))
{
this.txtJointDesc.Text = "Φ" + this.txtDia.Text.Trim() + "×" + this.txtSch.Text.Trim();
}
}
// 非常规焊缝
protected void txtWeldL_TextChanged(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.txtWeldL.Text.Trim()))
{
this.txtJointDesc.Text = "L=" + this.txtWeldL.Text.Trim() + "×" + this.txtSch.Text.Trim();
}
}
#endregion
#region DropDownList下拉选择事件
/// <summary>
/// 焊缝类型下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlJOTY_ID_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.ddlJOTY_ID.SelectedValue != BLL.Const._Null)
{
var joty = BLL.HJGL_WeldService.GetJointTypeByID(this.ddlJOTY_ID.SelectedValue);
if (joty != null)
{
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(this.ISO_ID);
if (isoInfo != null)
{
if (!string.IsNullOrEmpty(isoInfo.ISC_ID) && !string.IsNullOrEmpty(isoInfo.ISO_Executive))
{
var weldControl = BLL.HJGL_WeldControlService.GEtWeldControlByISCIDAndExecStandardId(isoInfo.ISC_ID, isoInfo.ISO_Executive);
if (weldControl != null)
{
if (joty.JOTY_Group == "1")
{
this.drpNDTR_ID.SelectedValue = weldControl.Joty_Rate;
this.drpJOT_QualifiedLevel.SelectedValue = weldControl.Joty_Level;
}
else if (joty.JOTY_Group == "2")
{
this.drpNDTR_ID.SelectedValue = weldControl.Joty_C_Rate;
this.drpJOT_QualifiedLevel.SelectedValue = weldControl.Joty_C_Level;
}
else if (joty.JOTY_Group == "3")
{
this.drpNDTR_ID.SelectedValue = weldControl.Joty_D_Rate;
this.drpJOT_QualifiedLevel.SelectedValue = weldControl.Joty_D_Level;
}
else
{
this.drpNDTR_ID.SelectedValue = BLL.Const._Null;
this.drpJOT_QualifiedLevel.SelectedValue = BLL.Const._Null;
}
}
else
{
this.drpNDTR_ID.SelectedValue = BLL.Const._Null;
this.drpJOT_QualifiedLevel.SelectedValue = BLL.Const._Null;
}
}
}
}
else
{
this.drpNDTR_ID.SelectedValue = BLL.Const._Null;
this.drpJOT_QualifiedLevel.SelectedValue = BLL.Const._Null;
}
}
else
{
this.drpNDTR_ID.SelectedValue = BLL.Const._Null;
this.drpJOT_QualifiedLevel.SelectedValue = BLL.Const._Null;
}
}
/// <summary>
/// 材质1下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlSTE1_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.ddlSTE1.SelectedValue != BLL.Const._Null)
{
var ste = BLL.HJGL_MaterialService.GetSteelBySteID(this.ddlSTE1.SelectedValue);
if (ste != null)
{
this.txtHardQuaStandard.Text = ste.HardQuaStandard;
}
else
{
this.txtHardQuaStandard.Text = string.Empty;
}
this.ddlSTE2.SelectedValue = ddlSTE1.SelectedValue;
}
else
{
this.txtHardQuaStandard.Text = string.Empty;
}
}
/// <summary>
/// 是否显示热处理类型
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpIS_Proess_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpIS_Proess.SelectedValue == "1")
{
this.drpProessTypes.Hidden = false;
}
else
{
this.drpProessTypes.Hidden = true;
}
}
#endregion
}
}

359
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchModity.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,359 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class JointInfoBatchModity
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtJointNoS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtJointNoS;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// drpInstallationId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallationId;
/// <summary>
/// ddlSTE1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSTE1;
/// <summary>
/// ddlSTE2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSTE2;
/// <summary>
/// ddlWLO_CODE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWLO_CODE;
/// <summary>
/// ddlJOTY_ID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlJOTY_ID;
/// <summary>
/// ddlJST_ID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlJST_ID;
/// <summary>
/// ddlJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlJointAttribute;
/// <summary>
/// ddlWME_ID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWME_ID;
/// <summary>
/// txtDia 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDia;
/// <summary>
/// txtSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSize;
/// <summary>
/// txtSch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSch;
/// <summary>
/// txtJointDesc 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointDesc;
/// <summary>
/// txtLastTemp 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtLastTemp;
/// <summary>
/// txtCellTemp 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtCellTemp;
/// <summary>
/// txtPrepareTemp 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtPrepareTemp;
/// <summary>
/// txtElectricity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtElectricity;
/// <summary>
/// drpIsSpecial 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsSpecial;
/// <summary>
/// drpNDTR_ID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNDTR_ID;
/// <summary>
/// drpJOT_QualifiedLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJOT_QualifiedLevel;
/// <summary>
/// txtHardQuaStandard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHardQuaStandard;
/// <summary>
/// ddlWeldSilk 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldSilk;
/// <summary>
/// ddlWeldMat 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldMat;
/// <summary>
/// drpIS_Proess 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIS_Proess;
/// <summary>
/// drpProessTypes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownBox drpProessTypes;
/// <summary>
/// SimpleForm3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm3;
/// <summary>
/// Label10 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label10;
/// <summary>
/// RadioButtonList1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBoxList RadioButtonList1;
/// <summary>
/// lb1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lb1;
/// <summary>
/// txtPressureTestPackageNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPressureTestPackageNo;
/// <summary>
/// txtWeldL 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtWeldL;
/// <summary>
/// lbDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbDef;
}
}

6
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage { namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class PipelineManage { public partial class PipelineManage
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。

10
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatch.aspx.cs
View File

@ -341,10 +341,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
where x.JOT_JointNo.Contains("G") && x.BatchId == batchId && x.PointTypeStr == "1" where x.JOT_JointNo.Contains("G") && x.BatchId == batchId && x.PointTypeStr == "1"
select x).Count(); select x).Count();
oneGTrustCounts = oneGTrustCount.ToString(); oneGTrustCounts = oneGTrustCount.ToString();
if (GjointCount != 0)
{
oneGtrustRate = (oneGTrustCount * 100.0 / oneTrustCount * 1.0).ToString("0.00") + "%";
}
if (jointCount != 0) if (jointCount != 0)
{ {
totalCheckRate = (totalCheckCount * 100.0 / jointCount * 1.0).ToString("0.00") + "%"; totalCheckRate = (totalCheckCount * 100.0 / jointCount * 1.0).ToString("0.00") + "%";
@ -352,6 +349,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
chFixedJotCounts = chFixedJotCount.ToString(); chFixedJotCounts = chFixedJotCount.ToString();
needCheckCount = Convert.ToInt32(Math.Ceiling(jointCount * Convert.ToDecimal(NDTR_Name.Replace("%", "")) / 100)); needCheckCount = Convert.ToInt32(Math.Ceiling(jointCount * Convert.ToDecimal(NDTR_Name.Replace("%", "")) / 100));
needCheckCounts = needCheckCount.ToString(); needCheckCounts = needCheckCount.ToString();
if (needCheckCount != 0)
{
oneGtrustRate = (oneGTrustCount * 100.0 / needCheckCount * 1.0).ToString("0.00") + "%";
}
totalWeldCount = (from x in Funs.DB.HJGL_BO_BatchDetail totalWeldCount = (from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_PW_JointInfo join y in Funs.DB.HJGL_PW_JointInfo
on x.JOT_ID equals y.JOT_ID on x.JOT_ID equals y.JOT_ID

7
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/IsoCheckStatistics.aspx
View File

@ -40,16 +40,17 @@
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server"> BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线焊接检测统计表" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线焊接检测统计表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ISO_IsoNo" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="ISO_IsoNo" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="ISO_IsoNo" AllowSorting="true" SortField="ISO_IsoNo" DataIDField="ISO_IsoNo" AllowSorting="true" SortField="ISO_IsoNo"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
OnPageIndexChange="Grid1_PageIndexChange"> OnPageIndexChange="Grid1_PageIndexChange">
<Columns> <Columns>
<f:TemplateField ColumnID="tfNumber" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"> <f:TemplateField ColumnID="tfNumber" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label> <asp:Label ID="labNumber" runat="server" Text='<%# Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<f:RenderField HeaderText="施工号" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" <f:RenderField HeaderText="施工号" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> </f:RenderField>

2
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/IsoCheckStatistics.aspx.cs
View File

@ -73,7 +73,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_IsoCheckStatistics", parameter); DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_IsoCheckStatistics", parameter);
this.Grid1.RecordCount = tb.Rows.Count; this.Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table; Grid1.DataSource = table;
Grid1.DataBind(); Grid1.DataBind();

6
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/IsoCheckStatistics.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport { namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class IsoCheckStatistics { public partial class IsoCheckStatistics
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。

11
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
View File

@ -60,7 +60,12 @@
HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String" <f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
HeaderText="入库自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldCode"> HeaderText="质保书自编号" HeaderTextAlign="Center" TextAlign="Center" SortField="WeldCode">
</f:RenderField>
<f:CheckBoxField Width="90px" RenderAsStaticField="true" TextAlign="Center" DataField="IsSure"
HeaderText="是否确认" />
<f:RenderField Width="100px" ColumnID="SureMan" DataField="SureMan" FieldType="String"
HeaderText="确认人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="90px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String" <f:RenderField Width="90px" ColumnID="WeldTypeName" DataField="WeldTypeName" FieldType="String"
HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
@ -119,10 +124,14 @@
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="600px"> Width="800px" Height="600px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
runat="server" Text="编辑" Icon="Pencil"> runat="server" Text="编辑" Icon="Pencil">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuSure" OnClick="btnMenuSure_Click" EnablePostBack="true"
runat="server" ConfirmTarget="Top" Icon="Pencil" Text="质保书自编号确认" >
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete"> ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete">
</f:MenuButton> </f:MenuButton>

70
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
View File

@ -39,10 +39,12 @@ namespace FineUIPro.Web.WeldMat.Stock
string strSql = @"SELECT StockIn.StockInId,StockIn.WeldId,StockIn.Amount,StockIn.Weight,Users.UserName AS Materialman,StockIn.InStockDate, string strSql = @"SELECT StockIn.StockInId,StockIn.WeldId,StockIn.Amount,StockIn.Weight,Users.UserName AS Materialman,StockIn.InStockDate,
ReviewDate,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,StockIn.Warrantybook, StockIn.HeartNo, ReviewDate,Weld.WeldCode,Weld.WeldName,Weld.WeldSpec,StockIn.Warrantybook, StockIn.HeartNo,
WeldType.WeldTypeName,WeldType.WeldUnit,(unit.UnitName+'('+store.UnitStoreName+')') AS UnitStoreName, WeldType.WeldTypeName,WeldType.WeldUnit,(unit.UnitName+'('+store.UnitStoreName+')') AS UnitStoreName,
(CASE WHEN (StockIn.AttachUrl!='' AND StockIn.AttachUrl IS NOT NULL) THEN '是' ELSE '否' END) IsUploadAttach (CASE WHEN (StockIn.AttachUrl!='' AND StockIn.AttachUrl IS NOT NULL) THEN '是' ELSE '否' END) IsUploadAttach,
StockIn.IsSure ,sureUser.UserName AS SureMan
FROM dbo.Weld_StockIn AS StockIn FROM dbo.Weld_StockIn AS StockIn
LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=StockIn.WeldId LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=StockIn.WeldId
LEFT JOIN dbo.Sys_User AS Users ON Users.UserId=StockIn.Materialman LEFT JOIN dbo.Sys_User AS Users ON Users.UserId=StockIn.Materialman
LEFT JOIN dbo.Sys_User AS sureUser ON sureUser.UserId=StockIn.SureMan
LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId LEFT JOIN dbo.Weld_WeldType AS WeldType ON WeldType.WeldTypeId = Weld.WeldTypeId
LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=StockIn.UnitStoreId LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId=StockIn.UnitStoreId
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=store.UnitId LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=store.UnitId
@ -192,6 +194,72 @@ namespace FineUIPro.Web.WeldMat.Stock
} }
} }
/// <summary>
/// 质保书自编号确认
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuSure_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CLGL_StockInMenuId, BLL.Const.BtnCheck))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string id = Grid1.SelectedRowID;
if (!string.IsNullOrEmpty(id))
{
var q = BLL.StockInService.GetStockInById(id);
if (q.UnitStoreId != null)
{
var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId);
if (s != null && s.UnitId == CurrUser.UnitId)
{
if (s.IsUse == true)
{
if (q.IsSure == true)
{
btnMenuSure.ConfirmText = "是否取消质保书自编号确认？";
BLL.StockInService.WarrantybookSure(id, null, null);
}
else
{
btnMenuSure.ConfirmText = "是否确认质保书自编号正确？";
string sureMan = this.CurrUser.UserId;
BLL.StockInService.WarrantybookSure(id, true, sureMan);
}
this.BindGrid();
ShowNotify("质保书自编号确认成功!", MessageBoxIcon.Success);
BLL.Sys_LogService.AddLog(BLL.Const.System_7, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "质保书自编号确认");
}
else
{
Alert.ShowInTop("该仓库已停用，不能进行质保书自编号确认！", MessageBoxIcon.Warning);
return;
}
}
else
{
Alert.ShowInTop("非本单位的数据，不能进行质保书自编号确认！", MessageBoxIcon.Warning);
return;
}
}
}
}
else
{
Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
#region 编辑 #region 编辑
/// <summary> /// <summary>
/// 双击Grid事件 /// 双击Grid事件

15
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.Stock { namespace FineUIPro.Web.WeldMat.Stock
{
public partial class StockIn { public partial class StockIn
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -174,6 +176,15 @@ namespace FineUIPro.Web.WeldMat.Stock {
/// </remarks> /// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit; protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuSure 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuSure;
/// <summary> /// <summary>
/// btnMenuDelete 控件。 /// btnMenuDelete 控件。
/// </summary> /// </summary>

2
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInEdit.aspx
View File

@ -30,7 +30,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtWarrantybook" runat="server" Label="入库自编号" LabelAlign="Right" Required="true" <f:TextBox ID="txtWarrantybook" runat="server" Label="质保书自编号" LabelAlign="Right" Required="true"
ShowRedStar="true"> ShowRedStar="true">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true"> <f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true">

2
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInit.aspx
View File

@ -71,7 +71,7 @@
HeaderText="回收重量" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="回收重量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String" <f:RenderField Width="120px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String"
HeaderText="质保书号" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="质保书自编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="180px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String" <f:RenderField Width="180px" ColumnID="UnitStoreName" DataField="UnitStoreName" FieldType="String"
HeaderText="单位仓库" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="单位仓库" HeaderTextAlign="Center" TextAlign="Center">

2
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInitEdit.aspx
View File

@ -31,7 +31,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtWarrantybook" runat="server" Label="入库自编号" LabelAlign="Right" Required="true" <f:TextBox ID="txtWarrantybook" runat="server" Label="质保书自编号" LabelAlign="Right" Required="true"
ShowRedStar="true"> ShowRedStar="true">
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true"> <f:TextBox ID="txtWeldType" runat="server" Label="类型" LabelAlign="Right" Readonly="true">

2
HJGL_ZH/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs
View File

@ -69,7 +69,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId
LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId
WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0 WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0
AND store.IsUse=1 AND store.IsUse=1 AND StockIn.IsSure=1
AND StockIn.WeldId=@WeldId AND store.UnitId=@UnitId"; AND StockIn.WeldId=@WeldId AND store.UnitId=@UnitId";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (plan != null) if (plan != null)

48
HJGL_ZH/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs
View File

@ -539,14 +539,60 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
break; break;
} }
} }
// 在同一单位跨项目如有未完结的领料也不能领用
if (isUsing) if (isUsing)
{
bool otherIsUsed = true;
string strSql = @"SELECT m.UsingMatId, m.ProjectId, m.WeldId, welder.WED_Code
FROM dbo.Weld_UsingMat m
LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId
LEFT JOIN dbo.HJGL_BS_Welder welder ON welder.WED_ID=m.UsingMan
WHERE m.IsWelderConfirm=1 AND m.IsStoreManConfirm=1
AND (m.IsClose IS NULL OR m.IsClose=0)
AND usingPlan.UsingManOne=@WelderId
AND usingPlan.UsingUnit=@UsingUnit
AND m.ProjectId IN (SELECT DISTINCT ProjectId FROM dbo.Project_User WHERE UserId=@CurrUserId) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@WelderId", this.WelderId));
if (CurrUser.UnitId != null)
{
listStr.Add(new SqlParameter("@UsingUnit", CurrUser.UnitId));
}
else
{
listStr.Add(new SqlParameter("@UsingUnit", null));
}
listStr.Add(new SqlParameter("@CurrUserId", this.CurrUser.UserId));
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
for (int i = 0; i < dt.Rows.Count; i++)
{
string usingMatId = dt.Rows[i]["UsingMatId"].ToString();
var usingMat = BLL.UsingMatService.GetUsingMatById(usingMatId);
var uWeld = BLL.WeldInfoService.GetWeldInfoById(usingMat.WeldId);
if (uWeld != null && uWeld.WeldTypeId == weldTypeId)
{
otherIsUsed = false;
break;
}
}
if (otherIsUsed)
{ {
string window = String.Format("ShowStockIn.aspx?UsingPlanId={0}", this.Grid2.SelectedRowID, "编辑 - "); string window = String.Format("ShowStockIn.aspx?UsingPlanId={0}", this.Grid2.SelectedRowID, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window)); PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
} }
else else
{ {
ShowNotify("有未完结的领料计划，处理后才能领用！"); ShowNotify("其它项目有未完结的领料计划，处理后才能领用！");
}
}
else
{
ShowNotify("本项目有未完结的领料计划，处理后才能领用！");
} }
} }
} }

6
HJGL_ZH/FineUIPro.Web/Welder/FilmInfoQuery.aspx
View File

@ -62,6 +62,9 @@
<f:RenderField Width="100px" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc" FieldType="String" <f:RenderField Width="100px" ColumnID="JOT_JointDesc" DataField="JOT_JointDesc" FieldType="String"
HeaderText="焊口规格" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="焊口规格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="100px" ColumnID="STE_Code" DataField="STE_Code" FieldType="String"
HeaderText="焊口材质" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="60px" ColumnID="FilmNum" DataField="FilmNum" FieldType="String" <f:RenderField Width="60px" ColumnID="FilmNum" DataField="FilmNum" FieldType="String"
HeaderText="片号" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="片号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
@ -80,6 +83,9 @@
<f:RenderField Width="80px" ColumnID="IsPass" DataField="IsPass" FieldType="String" <f:RenderField Width="80px" ColumnID="IsPass" DataField="IsPass" FieldType="String"
HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Center"> HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="ReportCheckDate" DataField="ReportCheckDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="检测日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ReportCode" DataField="ReportCode" <f:RenderField Width="150px" ColumnID="ReportCode" DataField="ReportCode"
FieldType="String" HeaderText="报告编号" HeaderTextAlign="Center" TextAlign="Center"> FieldType="String" HeaderText="报告编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField> </f:RenderField>