lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230221焊接修改

Browse Source
This commit is contained in:
李鹏飞
2023-02-21 16:36:13 +08:00
parent 8e8eecbcfc
commit c1960a5ff5
22 changed files with 575 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
-1
View File
@@ -91,7 +91,6 @@
</f:Button>
<f:Button ID="btnMatImport" Text="材料导入" ToolTip="材料导入" Icon="PackageIn" runat="server" OnClick="btnMatImport_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx
+23 -11
View File
@@ -4,21 +4,21 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title> </title>
<title></title>
</head>
<body class="f-bgcolor">
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="Toolbar3" runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar3" runat="server">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="true" EnablePostBack="true">
</f:Button>
Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="true" EnablePostBack="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -30,12 +30,24 @@
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" EnableBigData="true"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false" ForceFit="true"
EnableTextSelection="True" >
EnableTextSelection="True">
<Columns>
<f:RenderField Width="130px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="130px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="130px" ColumnID="MatchingRate" DataField="MatchingRate" SortField="MatchingRate"
FieldType="String" HeaderText="匹配率" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="130px" ColumnID="PlanStarDate" DataField="PlanStarDate" SortField="PlanStarDate"
FieldType="String" HeaderText="安装日期" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx.cs
+6 -3
View File
@@ -53,7 +53,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
var a = (from x in pipelinecode select new { PipelineCode = x }).ToList();
var b=(from x in Funs.DB .HJGL_Pipeline where pipelinecode.Contains(x.PipelineCode)
select new {管线号=x.PipelineCode ,匹配率="100%",计划安装日期=x.PlanStartDate }).ToList();
select new {管线号=x.PipelineCode ,流水段=x.FlowingSection,匹配率="100%",计划安装日期=x.PlanStartDate }).ToList();
MiniExcel.SaveAs(path, b);
string fileName = "材料匹配100%管线.xlsx";
@@ -70,9 +70,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
void BindGrid()
{
var a =( from x in pipelinecode select new { PipelineCode = x }).ToList();
var a = (from x in pipelinecode select new { PipelineCode = x }).ToList();
var b = (from x in Funs.DB.HJGL_Pipeline
where pipelinecode.Contains(x.PipelineCode)
select new { PipelineCode = x.PipelineCode, FlowingSection = x.FlowingSection, MatchingRate = "100%", PlanStarDate = x.PlanStartDate }).ToList();
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
this.Grid1.DataSource = a;
this.Grid1.DataSource = b;
this.Grid1.DataBind();
Grid1.RecordCount = a.Count();
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+16 -8
View File
@@ -36,7 +36,7 @@
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true">
EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
<Listeners>
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
</Listeners>
@@ -100,7 +100,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="机动化程度" ColumnID="WeldingMode"
<f:RenderField HeaderText="机动化程度" ColumnID="WeldingMode" Hidden="true"
DataField="WeldingMode" SortField="WeldingMode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
<Editor>
@@ -116,19 +116,27 @@
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia"
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="壁厚" ColumnID="Thickness"
<f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode"
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="公称直径" ColumnID="DNDia" Hidden="true"
DataField="DNDia" SortField="DNDia" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊接方法" ColumnID="WeldingMethodCode" Hidden="true"
DataField="WeldingMethodCode" SortField="WeldingMethodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode"
<f:RenderField HeaderText="焊条" ColumnID="WeldingRodCode" Hidden="true"
DataField="WeldingRodCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
<Editor>
@@ -137,7 +145,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode"
<f:RenderField HeaderText="焊丝" ColumnID="WeldingWireCode" Hidden="true"
DataField="WeldingWireCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
<Editor>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+37 -2
View File
@@ -120,6 +120,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
foreach (var q in unitWork1)
{
var a = (from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == q.UnitWorkId
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select x.TaskDate.Value.Date).Distinct().Count();
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
@@ -127,8 +132,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn1.CommandName = "单位工程";
tn1.ToolTip = "施工单位：" + u.UnitName;
tn1.EnableClickEvent = true;
tn1.EnableExpandEvent = true;
rootNode1.Nodes.Add(tn1);
BindNodes(tn1);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn1.Nodes.Add(newNode);
}
}
}
if (unitWork2.Count() > 0)
@@ -136,19 +150,40 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (var q in unitWork2)
{
var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
var a = (from x in Funs.DB.HJGL_WeldTask
where x.UnitWorkId == q.UnitWorkId
&& x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
&& x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
select x.TaskDate.Value.Date).Distinct().Count();
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName;
tn2.CommandName = "单位工程";
tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.EnableClickEvent = true;
tn2.EnableExpandEvent = true;
rootNode2.Nodes.Add(tn2);
BindNodes(tn2);
if (a > 0)
{
// BindNodes(tn1);
TreeNode newNode = new TreeNode();
newNode.Text = "加载管线...";
newNode.NodeID = "加载管线...";
tn2.Nodes.Add(newNode);
}
}
}
}
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
if (e.Node.Nodes[0].NodeID == "加载管线...")
{
e.Node.Nodes.Clear();
BindNodes(e.Node);
}
}
private void BindNodes(TreeNode node)
{
var p = (from x in Funs.DB.HJGL_WeldTask