zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
+3
View File
@@ -49,6 +49,9 @@
<f:Button ID="btnNew" Text="增加" Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
<f:Button ID="betDel" Text="批量删除" ToolTip="批量删除当前条件下焊口" Icon="Delete"
runat="server" OnClick="betDel_Click">
</f:Button>
<f:Button ID="btnOut2" runat="server" Text="导出" ToolTip="导出焊口初始数据信息" EnablePostBack="true" Icon="FolderUp" OnClick="btnOut2_Click">
</f:Button>
SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
+59 -29
View File
@@ -188,18 +188,23 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
IQueryable<Model.PW_IsoInfo> isoInfo = from x in Funs.DB.PW_IsoInfo
where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkAreaId == e.Node.NodeID.Split('_')[0]
orderby x.ISO_IsoNo
select x;
string a = this.txtIsono.Text.Trim();
if (!string.IsNullOrEmpty(a))
{
isoInfo = isoInfo.Where(x => x.ISO_IsoNo.Contains(a));
}
if (e.Node.ToolTip == "区域非标管线")
{
e.Node.Nodes.Clear();
List<Model.PW_IsoInfo> isoInfo = new List<Model.PW_IsoInfo>();
isoInfo = (from x in BLL.Funs.DB.PW_IsoInfo
where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkAreaId == e.Node.NodeID.Split('_')[0] && x.Is_Standard==true
&& x.ISO_IsoNo.Contains(this.txtIsono.Text.Trim())
orderby x.ISO_IsoNo
select x).ToList();
foreach (var item in isoInfo)
var getS = isoInfo.Where(x => x.Is_Standard == true).OrderBy(x => x.ISO_IsoNo);
foreach (var item in getS)
{
var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == item.ISO_ID select x).Count();
var jotCount = Funs.DB.PW_JointInfo.Where(x => x.ISO_ID == item.ISO_ID).Count();
TreeNode newNode = new TreeNode();
if (!String.IsNullOrEmpty(item.ISO_Sheet))
{
@@ -219,15 +224,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
else if (e.Node.ToolTip == "区域标准管线")
{
e.Node.Nodes.Clear();
List<Model.PW_IsoInfo> isoInfo = new List<Model.PW_IsoInfo>();
isoInfo = (from x in BLL.Funs.DB.PW_IsoInfo
where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkAreaId == e.Node.NodeID.Split('_')[0] && x.Is_Standard == false
&& x.ISO_IsoNo.Contains(this.txtIsono.Text.Trim())
orderby x.ISO_IsoNo
select x).ToList();
foreach (var item in isoInfo)
var getNS = isoInfo.Where(x => x.Is_Standard == false).OrderBy(x => x.ISO_IsoNo);
foreach (var item in getNS)
{
var jotCount = (from x in Funs.DB.PW_JointInfo where x.ISO_ID == item.ISO_ID select x).Count();
var jotCount = Funs.DB.PW_JointInfo.Where(x => x.ISO_ID == item.ISO_ID).Count();
TreeNode newNode = new TreeNode();
if (!String.IsNullOrEmpty(item.ISO_Sheet))
{
@@ -237,8 +237,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
newNode.Text = item.ISO_IsoNo;
}
newNode.Text += "【" + jotCount.ToString() + "焊口】";
newNode.ToolTip = "管线(页数)【焊口数】";
newNode.ToolTip = "管线(页数)【焊口数】";
newNode.NodeID = item.ISO_ID;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
@@ -957,18 +958,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
private bool judgementDelete(string id, bool isShow)
{
string content = string.Empty;
//if (BLL.HJGL_HotProessManageEditService.GetHotProessByJotId(id) > 0)
//{
// content = "热处理已经使用了该焊口，不能删除！";
//}
//if (BLL.Funs.DB.HJGL_CH_TrustItem.FirstOrDefault(x => x.JOT_ID == id) != null)
//{
// content = "无损委托已经使用了该焊口，不能删除！";
//}
//if (BLL.Funs.DB.HJGL_CH_CheckItem.FirstOrDefault(x => x.JOT_ID == id) != null)
//{
// content = "检测单已经使用了该焊口，不能删除！";
//}
var jot = Funs.DB.PW_JointInfo.FirstOrDefault(x => x.JOT_ID == id);
if (jot != null)
{
if (!string.IsNullOrEmpty(jot.DReportID))
{
var dr = Funs.DB.BO_WeldReportMain.FirstOrDefault(x => x.DReportID == jot.DReportID);
if (dr != null)
{
content = "日报："+dr.JOT_DailyReportNo+ "使用了该焊口，不能删除！";
}
}
}
else
{
content = "删除焊口不存在！";
}
if (string.IsNullOrEmpty(content))
{
return true;
@@ -1121,5 +1126,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string strCode = "WeldedJoint$" + Grid1.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/Controls/SeeQRImage.aspx?JOT_ID={0}&strCode={1}", Grid1.SelectedRowID, strCode), "二维码查看", 400, 400));
}
protected void betDel_Click(object sender, EventArgs e)
{
if (GetButtonPower(Const.BtnDelete))
{
var getMess = PW_JointInfoService.DelAllJots(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID, this.txtJOT_JointNo.Text.Trim());
if (getMess != null)
{
if (getMess.code == 1)
{
this.InitTreeMenu();//加载树
this.BindGrid();//加载树
ShowNotify(getMess.message, MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(getMess.message, MessageBoxIcon.Success);
}
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.designer.cs
Generated
+9
View File
@@ -138,6 +138,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.Button btnBatchAdd;
/// <summary>
/// betDel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button betDel;
/// <summary>
/// btnOut2 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx
+29 -109
View File
@@ -37,34 +37,33 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线代号" LabelAlign="Right" Width="220px" LabelWidth="90px" EmptyText="输入查询条件"></f:TextBox>
<f:DropDownList ID="drpIsStanded" runat="server" Label="是否非标" LabelAlign="Right" Width="200px" LabelWidth="90px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpSer" runat="server" Label="介质" LabelAlign="Right" Width="200px" LabelWidth="70px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpNDT" runat="server" Label="探伤类型" LabelAlign="Right" Width="220px" LabelWidth="90px" EnableEdit="true"></f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtIso_IsoNumber" runat="server" Label="单线图号" LabelAlign="Right" Width="220px" LabelWidth="90px" EmptyText="输入查询条件"></f:TextBox>
<f:DropDownList ID="drpSteId" runat="server" Label="材质" LabelAlign="Right" Width="220px" LabelWidth="90px" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtISO_Specification" runat="server" Label="规格" LabelAlign="Right" Width="200px" LabelWidth="70px" EmptyText="输入查询条件"></f:TextBox>
<f:TextBox ID="txtIsoNo" runat="server" Label="管线代号" LabelAlign="Right" Width="220px" LabelWidth="80px" EmptyText="输入查询条件"></f:TextBox>
<f:DropDownList ID="drpIsStanded" runat="server" Label="是否非标" LabelAlign="Right" Width="220px" LabelWidth="80px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpSer" runat="server" Label="介质" LabelAlign="Right" Width="220px" LabelWidth="80px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpNDT" runat="server" Label="探伤类型" LabelAlign="Right" Width="220px" LabelWidth="80px" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtIso_IsoNumber" runat="server" Label="单线图号" LabelAlign="Right" Width="220px" LabelWidth="80px" EmptyText="输入查询条件"></f:TextBox>
<f:DropDownList ID="drpSteId" runat="server" Label="材质" LabelAlign="Right" Width="220px" LabelWidth="80px" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtISO_Specification" runat="server" Label="规格" LabelAlign="Right" Width="220px" LabelWidth="80px" EmptyText="输入查询条件"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="查询" ToolTip="查询" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect" runat="server"
OnClick="btnSelectColumn_Click">
OnClick="btnSelectColumn_Click" Hidden="true">
</f:Button>
<f:Button ID="btnNew" Text="增加" ToolTip="增加" Icon="Add" runat="server" OnClick="btnNew_Click">
</f:Button>
<f:Button ID="betDel" Text="批量删除" ToolTip="批量删除当前条件下管线" Icon="Delete"
runat="server" OnClick="betDel_Click">
</f:Button>
<f:Button ID="btnQR" Text="批量二维码" ToolTip="批量生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
</f:Button>
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ISO_ID" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="ISO_ID" AllowSorting="true"
SortField="ISO_IsoNo" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
runat="server" BoxFlex="1" DataKeyNames="ISO_ID" AllowPaging="true" IsDatabasePaging="true"
EnableColumnLines="true" DataIDField="ISO_ID" AllowSorting="true"
SortField="ISO_IsoNo" SortDirection="ASC" OnSort="Grid1_Sort"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowColumnLocking="true">
<Columns>
@@ -72,7 +71,13 @@
<f:RenderField Width="200px" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo"
FieldType="String" HeaderText="管线代号" HeaderTextAlign="Center" Locked="true">
</f:RenderField>
<f:TemplateField Width="90px" HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="90px" ColumnID="TotalDin" DataField="TotalDin"
FieldType="Double" HeaderText="总达因数" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="JointCount" DataField="JointCount"
FieldType="Int" HeaderText="总焊口量" HeaderTextAlign="Center">
</f:RenderField>
<%-- <f:TemplateField Width="90px" HeaderText="总达因数" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label8" runat="server" Text='<%# ConvertTotalDin(Eval("ISO_ID")) %>'></asp:Label>
</ItemTemplate>
@@ -81,7 +86,7 @@
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertJointQty(Eval("ISO_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</f:TemplateField>--%>
<f:RenderField Width="220px" ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="单位" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MediumName" DataField="MediumName" FieldType="String" HeaderText="介质" HeaderTextAlign="Center">
@@ -93,95 +98,15 @@
<f:RenderField Width="100px" ColumnID="DetectionTypeName" DataField="DetectionTypeName" FieldType="String" HeaderText="探伤类型" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WorkAreaCode" DataField="WorkAreaCode" FieldType="String" HeaderText="施工区域" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_SysNo" DataField="ISO_SysNo" FieldType="String" HeaderText="系统号" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_SubSysNo" DataField="ISO_SubSysNo" FieldType="String" HeaderText="分系统号" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_CwpNo" DataField="ISO_CwpNo" FieldType="String" HeaderText="工作包号" HeaderTextAlign="Center">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_IsoNumber" DataField="ISO_IsoNumber" FieldType="String" HeaderText="单线图号" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_Rev" DataField="ISO_Rev" FieldType="String" HeaderText="图纸版次" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_Sheet" DataField="ISO_Sheet" FieldType="String" HeaderText="页数" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_PipeQty" DataField="ISO_PipeQty" FieldType="String" HeaderText="总管段数" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_Paint" DataField="ISO_Paint" FieldType="String" HeaderText="涂漆类别" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ISO_Insulator" DataField="ISO_Insulator" FieldType="String" HeaderText="绝热类别" HeaderTextAlign="Center">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="110px" HeaderText="材质" ColumnID="MaterialType" DataField="MaterialType" FieldType="String" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" HeaderText="执行标准" ColumnID="ISO_Executive" DataField="ISO_Executive" FieldType="String" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="修改人" ColumnID="ISO_Modifier" DataField="ISO_Modifier" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="修改日期" ColumnID="ISO_ModifyDate" DataField="ISO_ModifyDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="建档人" ColumnID="ISO_Creator" DataField="ISO_Creator" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="建档日期" ColumnID="ISO_CreateDate" DataField="ISO_CreateDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="设计压力" ColumnID="ISO_DesignPress" DataField="ISO_DesignPress" FieldType="String" HeaderTextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="设计温度" ColumnID="ISO_DesignTemperature" DataField="ISO_DesignTemperature" FieldType="String" HeaderTextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="试验压力" ColumnID="ISO_TestPress" DataField="ISO_TestPress" FieldType="String" HeaderTextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="试验温度" ColumnID="ISO_TestTemperature" DataField="ISO_TestTemperature" FieldType="String" HeaderTextAlign="Center" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="合格等级" ColumnID="ISO_NDTClass" DataField="ISO_NDTClass" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="渗透比例" ColumnID="ISO_PTRate" DataField="ISO_PTRate" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="合格等级" ColumnID="ISO_NDTClass" DataField="ISO_NDTClass" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="管道等级" ColumnID="PipingClassName" DataField="PipingClassName" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="渗透等级" ColumnID="ISO_PTClass" DataField="ISO_PTClass" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="是否酸洗" ColumnID="ISO_IfPickling" DataField="ISO_IfPickling" SortField="ISO_IfPickling"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="是否抛光" ColumnID="ISO_IfChasing" DataField="ISO_IfChasing" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:TemplateField Width="120px" HeaderText="试压包编号" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblPTP_TestPackageNo" runat="server" Text='<%# ConvertTestPackageNo(Eval("ISO_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="备注" ColumnID="ISO_Remark" DataField="ISO_Remark" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:TemplateField HeaderText="编辑CAD" Width="80px">
<ItemTemplate>
<a href='<%# "../../FileManage/editCAD.aspx?officetype=1&url=" + Eval("ISO_ID") %>'
target="_blank">编辑CAD</a>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField HeaderText="变更1" Width="80px">
<ItemTemplate>
<a href='<%# "../FileManage/editCAD.aspx?officetype=1&type=1&url=" + Eval("ISO_ID") %>'
target="_blank">编辑CAD</a>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField HeaderText="变更2" Width="80px">
<ItemTemplate>
<a href='<%# "../FileManage/editCAD.aspx?officetype=1&type=3&url=" + Eval("ISO_ID") %>'
target="_blank">编辑CAD</a>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField HeaderText="变更3" Width="80px">
<ItemTemplate>
<a href='<%# "../FileManage/editCAD.aspx?officetype=1&type=3&url=" + Eval("ISO_ID") %>'
target="_blank">编辑CAD</a>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField HeaderText="重置CAD编辑" Width="100px">
<ItemTemplate>
<asp:LinkButton ID="lbtnReset" runat="server" CommandArgument='<%# Bind("ISO_ID") %>'
ToolTip="重置CAD编辑" CommandName="Reset" CssClass="ItemLink" Text="重置"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -192,12 +117,7 @@
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="10000" />
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.cs
+46 -134
View File
@@ -10,7 +10,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class PipelineManage : PageBase
{
public string treeNodeId
{
get
@@ -44,13 +44,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
Funs.DropDownPageSize(this.ddlPageSize);
BLL.Base_TestMediumService.InitMediumDropDownList(this.drpSer, true);//介质
BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(this.drpNDT, true);//探伤类型
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpSteId, true,this.CurrUser.LoginProjectId);//材质
BLL.Base_MaterialService.InitMaterialDropDownList(this.drpSteId, true, this.CurrUser.LoginProjectId);//材质
ListItem[] lis = new ListItem[3];
lis[0] = new ListItem("- 请选择 -", "");
lis[1] = new ListItem("是","1");
lis[1] = new ListItem("是", "1");
lis[2] = new ListItem("否", "0");
this.drpIsStanded.DataValueField = "Value";
this.drpIsStanded.DataTextField = "Text";
@@ -196,9 +196,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
this.unitId = e.Node.ParentNode.NodeID.Split('|')[0];
treeNodeId = e.NodeID;
this.BindGrid(e.NodeID);
this.BindGrid();
}
#endregion
@@ -206,120 +205,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <summary>
/// 数据绑定
/// </summary>
private void BindGrid(string treeNodeId="")
private void BindGrid()
{
string strSql = @"SELECT iso.ISO_ID,
iso.ProjectId,
iso.ISO_IsoNo,
iso.UnitId,
unit.UnitName,
iso.TestMediumId,
testMedium.MediumName,
iso.DetectionRateId,
detectionRate.DetectionRateValue,
iso.DetectionTypeId,
detectionType.DetectionTypeName,
iso.WorkAreaId,
workArea.WorkAreaCode,
iso.ISO_SysNo,
iso.ISO_SubSysNo,
iso.ISO_CwpNo,
iso.ISO_IsoNumber,
iso.ISO_Rev,
iso.ISO_Sheet,
iso.ISO_PipeQty,
iso.ISO_Paint,
iso.ISO_Insulator,
iso.MaterialId,
material.MaterialType,
iso.ISO_Executive,
iso.ISO_Modifier,
iso.ISO_ModifyDate,
iso.ISO_Creator,
iso.ISO_CreateDate,
iso.ISO_DesignPress,
iso.ISO_DesignTemperature,
iso.ISO_TestPress,
iso.ISO_TestTemperature,
iso.ISO_NDTClass,
iso.ISO_PTRate,
case when iso.Is_Standard=1 then '是'else '否' end as Is_Standard,
iso.PipingClassId,
pipingClass.PipingClassName,
iso.ISO_PTClass,
(CASE WHEN iso.ISO_IfPickling='True' THEN '是' ELSE '否' END) AS ISO_IfPickling,
(CASE WHEN iso.ISO_IfChasing='True' THEN '是' ELSE '否' END) AS ISO_IfChasing,
iso.ISO_Remark"
+ @" FROM PW_IsoInfo AS iso"
+ @" LEFT JOIN Base_Unit AS unit ON unit.UnitId = iso.UnitId"
+ @" LEFT JOIN Base_TestMedium AS testMedium ON testMedium.TestMediumId = iso.TestMediumId"
+ @" LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = iso.DetectionRateId"
+ @" LEFT JOIN Base_DetectionType AS detectionType ON detectionType.DetectionTypeId = iso.DetectionTypeId"
+ @" LEFT JOIN ProjectData_WorkArea AS workArea ON workArea.WorkAreaId = iso.WorkAreaId"
+ @" LEFT JOIN Base_Material AS material ON material.MaterialId = iso.MaterialId"
+ @" LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = iso.PipingClassId"
+ @" WHERE iso.ProjectId=@ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (!string.IsNullOrEmpty(treeNodeId))
{
strSql += " AND workArea.WorkAreaId=@treeNodeId ";
listStr.Add(new SqlParameter("@treeNodeId", treeNodeId));
}
if (!string.IsNullOrEmpty(unitId))
{
strSql += " AND iso.UnitId=@unitId ";
listStr.Add(new SqlParameter("@unitId", unitId));
}
if (!string.IsNullOrEmpty(this.drpIsStanded.SelectedValue))
{
strSql += " AND iso.Is_Standard=@Is_Standard ";
listStr.Add(new SqlParameter("@Is_Standard", this.drpIsStanded.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim()))
{
strSql += " AND iso.ISO_IsoNo LIKE @ISO_IsoNo";
listStr.Add(new SqlParameter("@ISO_IsoNo", "%" + this.txtIsoNo.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.drpSer.SelectedValue) && this.drpSer.SelectedValue != BLL.Const._Null)
{
strSql += " AND iso.TestMediumId = @TestMediumId";
listStr.Add(new SqlParameter("@TestMediumId", this.drpSer.SelectedValue));
}
if (!string.IsNullOrEmpty(this.drpNDT.SelectedValue) && this.drpNDT.SelectedValue != BLL.Const._Null)
{
strSql += " AND iso.DetectionTypeId = @DetectionTypeId";
listStr.Add(new SqlParameter("@DetectionTypeId", this.drpNDT.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtIso_IsoNumber.Text.Trim()))
{
strSql += " AND iso.ISO_IsoNumber LIKE @isoNumber";
listStr.Add(new SqlParameter("@isoNumber", "%" + this.txtIso_IsoNumber.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.drpSteId.SelectedValue) && this.drpSteId.SelectedValue != BLL.Const._Null)
{
strSql += " AND iso.MaterialId = @MaterialId";
listStr.Add(new SqlParameter("@MaterialId", this.drpSteId.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtISO_Specification.Text.Trim()))
{
strSql += " AND iso.ISO_Specification LIKE @ISO_Specification";
listStr.Add(new SqlParameter("@ISO_Specification", "%" + this.txtISO_Specification.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
//this.OutputSummaryData(tb); ///取合计值
Grid1.DataSource = table;
var getData = PipelineService.getListData(this.CurrUser.LoginProjectId, treeNodeId, unitId, this.drpIsStanded.SelectedValue, this.txtIsoNo.Text.Trim()
, this.drpSer.SelectedValue, this.drpNDT.SelectedValue, this.txtIso_IsoNumber.Text.Trim(), this.drpSteId.SelectedValue
, this.txtISO_Specification.Text.Trim(), Grid1);
Grid1.RecordCount = PipelineService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
}
#endregion
@@ -354,7 +248,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid(this.treeNodeId);
BindGrid();
}
#endregion
@@ -407,9 +301,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!string.IsNullOrEmpty(treeNodeId))
{
BindGrid(treeNodeId);
BindGrid();
}
}
/// <summary>
/// 增加管线信息
@@ -520,16 +413,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
ShowNotify("删除成功！", MessageBoxIcon.Success);
}
if (!string.IsNullOrEmpty(treeNodeId))
{
this.BindGrid(treeNodeId);
}
else
{
this.BindGrid();
}
this.BindGrid();
}
else
{
@@ -785,8 +670,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void btnQR_Click(object sender, EventArgs e)
{
var getJointInfos = from x in Funs.DB.PW_JointInfo
where x.ProjectId == this.CurrUser.LoginProjectId && x.QRCodeAttachUrl == null
select x;
where x.ProjectId == this.CurrUser.LoginProjectId && x.QRCodeAttachUrl == null
select x;
int num = 0;
if (getJointInfos.Count() > 0)
{
@@ -819,11 +704,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
return;
}
string iso_Id = Grid1.SelectedRowID;
var getJots = Funs.DB.PW_JointInfo.Where(x => x.ISO_ID == iso_Id).Select(x=>x.JOT_ID);
var getJots = Funs.DB.PW_JointInfo.Where(x => x.ISO_ID == iso_Id).Select(x => x.JOT_ID);
if (getJots.Count() > 0)
{
string pList = string.Empty;
foreach (var id in getJots)
foreach (var id in getJots)
{
if (string.IsNullOrEmpty(pList))
{
@@ -846,5 +731,32 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
#endregion
protected void betDel_Click(object sender, EventArgs e)
{
if (GetButtonPower(Const.BtnDelete))
{
var getMess = PipelineService.DelAllPopeline(this.CurrUser.LoginProjectId, treeNodeId, unitId, this.drpIsStanded.SelectedValue, this.txtIsoNo.Text.Trim()
, this.drpSer.SelectedValue, this.drpNDT.SelectedValue, this.txtIso_IsoNumber.Text.Trim(), this.drpSteId.SelectedValue
, this.txtISO_Specification.Text.Trim());
if (getMess != null)
{
if (getMess.code == 1)
{
this.InitTreeMenu();//加载树
this.BindGrid();//加载树
ShowNotify(getMess.message, MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(getMess.message, MessageBoxIcon.Success);
}
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx.designer.cs
Generated
+9 -45
View File
@@ -129,15 +129,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.DropDownList drpNDT;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtIso_IsoNumber 控件。
/// </summary>
@@ -201,6 +192,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// betDel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button betDel;
/// <summary>
/// btnQR 控件。
/// </summary>
@@ -219,42 +219,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label8 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label8;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// lblPTP_TestPackageNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPTP_TestPackageNo;
/// <summary>
/// lbtnReset 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnReset;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx
+1 -1
View File
@@ -56,7 +56,7 @@
</f:Button>
<f:Button ID="btnGenerate" Text="委托" ToolTip="生成委托单" Icon="TableGo" runat="server" OnClick="btnGenerate_Click">
</f:Button>
<f:Button ID="btnPrint" runat="server" Text="打印" ToolTip="打印" Icon="Printer" OnClick="btnPrint_Click"></f:Button>
<f:Button ID="btnPrint" runat="server" Text="打印" ToolTip="打印" Icon="Printer" OnClick="btnPrint_Click" Hidden="true"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+17 -24
View File
@@ -52,39 +52,32 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="10px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" BodyPadding="5px"
runat="server" RedStarPosition="BeforeText" LabelAlign="Left" LabelWidth="80px">
<Rows>
<f:FormRow>
<f:FormRow ColumnWidths="30% 40% 30%">
<Items>
<f:Label ID="txtDailyReportNo" Label="日报告号" runat="server"
LabelWidth="100px" LabelAlign="Right">
<f:Label ID="txtDailyReportNo" Label="日报告号" runat="server">
</f:Label>
<f:Label ID="txtUnit" Label="单位" runat="server"
LabelWidth="100px" LabelAlign="Right">
<f:Label ID="txtUnit" Label="单位" runat="server">
</f:Label>
<f:Label ID="txtInstallation" Label="装置" runat="server"
LabelWidth="100px" LabelAlign="Right">
<f:Label ID="txtInstallation" Label="装置" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 40% 30%">
<Items>
<f:Label ID="txtCHT_Tabler" Label="制单人" runat="server">
</f:Label>
<f:Label ID="txtCHT_TableDate" Label="制单日期" runat="server">
</f:Label>
<f:Label ID="txtJOT_WeldDate" Label="焊接日期" runat="server">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtCHT_Tabler" Label="制单人" runat="server"
LabelWidth="100px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtCHT_TableDate" Label="制单日期" runat="server"
LabelWidth="100px" LabelAlign="Right">
</f:Label>
<f:Label ID="txtJOT_WeldDate" Label="焊接日期" runat="server"
LabelWidth="100px" LabelAlign="Right">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtJOT_Remark" Label="备注" runat="server"
LabelWidth="100px" LabelAlign="Right">
<f:Label ID="txtJOT_Remark" Label="备注" runat="server">
</f:Label>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx
+2 -1
View File
@@ -16,7 +16,8 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
<f:DropDownList ID="drpWorkArea" runat="server" Label="施工区域" LabelAlign="Right"></f:DropDownList>
<f:DropDownList ID="drpWorkArea" runat="server" EnableEdit="true"
Label="施工区域" LabelAlign="Right" ></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Text="区域焊口数" Icon="Find" OnClick="btnSearch_Click"></f:Button>
<f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs
+27 -24
View File
@@ -249,19 +249,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (string.IsNullOrEmpty(jointInfo.DReportID))
{
string row0 = pds.Rows[i][0].ToString();
var unit = units.Where(x => x.UnitCode == row0.Trim() && x.UnitId == this.CurrUser.UnitId).FirstOrDefault();
Model.Base_Unit unit = new Model.Base_Unit();
if (!string.IsNullOrEmpty(row0))
{
if (units.Where(x => x.UnitCode == row0.Trim()).FirstOrDefault() == null)
unit = units.FirstOrDefault(x => x.UnitCode == row0.Trim());
if (unit == null)
{
result += (i + 2).ToString() + "," + "单位代号" + "," + "[" + row0 + "]不存在！" + "|";
}
else
{
var area = workAreas.Where(x => x.UnitId == unit.UnitId && x.WorkAreaId == this.drpWorkArea.SelectedValue).FirstOrDefault();
if (area == null)
{
result += (i + 2).ToString() + "," + "区域" + "," + "该单位没有此区域号！" + "|";
}
}
}
else
{
result += (i + 2).ToString() + "," + "单位代号" + "," + "此项为必填项！" + "|";
}
string row1 = pds.Rows[i][1].ToString();
if (!string.IsNullOrEmpty(row1))
{
@@ -275,17 +285,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
result += (i + 2).ToString() + "," + "装置代号" + "," + "此项为必填项！" + "|";
}
if (!string.IsNullOrEmpty(row0))
{
if (unit != null)
{
var area = workAreas.Where(x => x.UnitId == unit.UnitId && x.WorkAreaId == this.drpWorkArea.SelectedValue).FirstOrDefault();
if (area == null)
{
result += (i + 2).ToString() + "," + "区域" + "," + "该单位没有此区域号！" + "|";
}
}
}
if (string.IsNullOrEmpty(pds.Rows[i][2].ToString()))
{
@@ -732,7 +732,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
report.DReportID = SQLHelper.GetNewID(typeof(Model.BO_WeldReportMain));
report.ProjectId = this.CurrUser.LoginProjectId;
report.InstallationId = Funs.DB.Project_Installation.FirstOrDefault(e => e.ProjectId == this.CurrUser.LoginProjectId && e.InstallationCode == pds.Rows[i][1].ToString().Trim()).InstallationId;
report.UnitId = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitCode == pds.Rows[i][0].ToString().Trim()&&e.UnitId == this.CurrUser.UnitId).UnitId;
report.UnitId = Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitCode == pds.Rows[i][0].ToString().Trim()).UnitId;
report.JOT_WeldDate = Convert.ToDateTime(pds.Rows[i][18].ToString().Trim());
report.JOT_DailyReportNo = reportNo;
report.CHT_Tabler = this.CurrUser.UserId;
@@ -762,17 +762,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
jointInfo.WME_ID = methods.First(e => e.WeldingMethodCode == pds.Rows[i][12].ToString().Trim()).WeldingMethodId;
}
jointInfo.DReportID = dReportID;
var unit = units.Where(x => x.UnitCode == pds.Rows[i][0].ToString().Trim()&&x.UnitId==this.CurrUser.UnitId).FirstOrDefault();
if (string.IsNullOrEmpty(pds.Rows[i][14].ToString().Trim()))
var unit = units.FirstOrDefault(x => x.UnitCode == pds.Rows[i][0].ToString().Trim());
if (unit != null)
{
jointInfo.JOT_CellWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.WED_Code == pds.Rows[i][15].ToString().Trim()).WED_ID;
jointInfo.JOT_FloorWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.WED_Code == pds.Rows[i][16].ToString().Trim()).WED_ID;
}
else
{
var teamGroup = teamGroups.Where(x => x.UnitId == unit.UnitId && x.TeamGroupCode == pds.Rows[i][14].ToString().Trim()).FirstOrDefault();
jointInfo.JOT_CellWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.TeamGroupId == teamGroup.TeamGroupId && e.WED_Code == pds.Rows[i][15].ToString().Trim()).WED_ID;
jointInfo.JOT_FloorWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.TeamGroupId == teamGroup.TeamGroupId && e.WED_Code == pds.Rows[i][16].ToString().Trim()).WED_ID;
if (string.IsNullOrEmpty(pds.Rows[i][14].ToString().Trim()))
{
jointInfo.JOT_CellWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.WED_Code == pds.Rows[i][15].ToString().Trim()).WED_ID;
jointInfo.JOT_FloorWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.WED_Code == pds.Rows[i][16].ToString().Trim()).WED_ID;
}
else
{
var teamGroup = teamGroups.Where(x => x.UnitId == unit.UnitId && x.TeamGroupCode == pds.Rows[i][14].ToString().Trim()).FirstOrDefault();
jointInfo.JOT_CellWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.TeamGroupId == teamGroup.TeamGroupId && e.WED_Code == pds.Rows[i][15].ToString().Trim()).WED_ID;
jointInfo.JOT_FloorWelder = welders.First(e => e.WED_Unit == unit.UnitId && e.TeamGroupId == teamGroup.TeamGroupId && e.WED_Code == pds.Rows[i][16].ToString().Trim()).WED_ID;
}
}
jointInfo.JOT_Location = pds.Rows[i][17].ToString().Trim();
jointInfo.JOT_Electricity = pds.Rows[i][19].ToString().Trim(); //电流