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

材料管理修改

Browse Source
This commit is contained in:
李鹏飞
2024-10-09 17:20:12 +08:00
parent a7205a984d
commit f06da19405
14 changed files with 154 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin_New/v17/.wsuo
BIN
View File
Binary file not shown.
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+8 -1
View File
@@ -16,6 +16,7 @@ namespace BLL
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
///所需材料数量列表
var NeedOutMateriaList = from x in db.HJGL_PipeLineMat var NeedOutMateriaList = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
@@ -27,7 +28,7 @@ namespace BLL
g.Key, g.Key,
NeedNum = g.Sum(x => x.Number) ?? 0, NeedNum = g.Sum(x => x.Number) ?? 0,
}; };
///实际材料入库数量列表
var RealInMateriaList = from x in db.Tw_InputDetail var RealInMateriaList = from x in db.Tw_InputDetail
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
group x by x.MaterialCode group x by x.MaterialCode
@@ -44,9 +45,12 @@ namespace BLL
from y in gg.DefaultIfEmpty() from y in gg.DefaultIfEmpty()
join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz join z in db.HJGL_MaterialCodeLib on x.Key equals z.MaterialCode into zz
from z in zz.DefaultIfEmpty() from z in zz.DefaultIfEmpty()
join m in db.Tw_MaterialStock on x.Key equals m.PipeLineMatCode into mm
from m in mm.DefaultIfEmpty()
select new Tw_ArrivalStatisticsOutPut select new Tw_ArrivalStatisticsOutPut
{ {
MaterialCode = x.Key, MaterialCode = x.Key,
StockNum = m==null?0: (decimal)m.StockNum,
NeedNum = x.NeedNum, NeedNum = x.NeedNum,
RealNum = y==null?0:y.RealNum, RealNum = y==null?0:y.RealNum,
MaterialName = z.MaterialName, MaterialName = z.MaterialName,
@@ -75,12 +79,15 @@ namespace BLL
var requiredMaterials = (from x in db.HJGL_PipeLineMat var requiredMaterials = (from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId
join m in db.WBS_UnitWork on z.UnitWorkId equals m.UnitWorkId
where z.ProjectId == projectid && pipelineIds.Contains(z.PipelineId) where z.ProjectId == projectid && pipelineIds.Contains(z.PipelineId)
select new Tw_PipeMatMatchOutput select new Tw_PipeMatMatchOutput
{ {
Id= Guid.NewGuid().ToString(), Id= Guid.NewGuid().ToString(),
PipelineId =x.PipelineId, PipelineId =x.PipelineId,
PipelineCode=z.PipelineCode, PipelineCode=z.PipelineCode,
UnitWorkId=z.UnitWorkId,
UnitWorkName=m.UnitWorkName,
PrefabricatedComponents=x.PrefabricatedComponents, PrefabricatedComponents=x.PrefabricatedComponents,
MaterialCode = x.MaterialCode, MaterialCode = x.MaterialCode,
MaterialName= y.MaterialName, MaterialName= y.MaterialName,
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs
+8 -1
View File
@@ -80,7 +80,14 @@ namespace BLL
return Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == Id); return Funs.DB.Tw_InOutPlanDetail_Relation.FirstOrDefault(x => x.Id == Id);
} }
public static Model.Tw_InOutPlanDetail_Relation GetByPipelineId(string pipelineId,string WarehouseCode)
{
var q= from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB .Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
where x.PipelineId == pipelineId && y.WarehouseCode == WarehouseCode
select x;
return q.FirstOrDefault();
}
public static void Add(Model.Tw_InOutPlanDetail_Relation newtable) public static void Add(Model.Tw_InOutPlanDetail_Relation newtable)
{ {
SGGL/BLL/CLGL/TwInputmasterService.cs
+1 -1
View File
@@ -254,7 +254,7 @@ namespace BLL
ReqUnitId = plan.ReqUnitId, ReqUnitId = plan.ReqUnitId,
AuditMan = plan.CreateMan, AuditMan = plan.CreateMan,
AuditDate = plan.AuditDate, AuditDate = plan.AuditDate,
Remark=plan.Remark Remark= remark
}; };
if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库) if ((TwConst.TypeInt)plan.TypeInt!= TwConst.TypeInt.采购入库)
{ {
SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs
+1
View File
@@ -25,6 +25,7 @@ namespace BLL
/// 已装箱 /// 已装箱
/// </summary> /// </summary>
public static int state_2 = 2; public static int state_2 = 2;
/// <summary> /// <summary>
/// 获取状态名称 /// 获取状态名称
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
+4 -1
View File
@@ -37,7 +37,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:TextBox runat="server" ID="txtMaterialCode" Label="材料编码" EmptyText="输入查询条件" Width="230px" LabelWidth="70px"></f:TextBox> <f:TextBox runat="server" ID="txtMaterialCode" Label="材料编码" EmptyText="输入查询条件" Width="230px" LabelWidth="100px"></f:TextBox>
<f:Label runat="server" ID="lbRate"></f:Label> <f:Label runat="server" ID="lbRate"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
@@ -77,6 +77,9 @@
<f:RenderField Width="150px" ColumnID="RealNum" DataField="RealNum" SortField="RealNum" <f:RenderField Width="150px" ColumnID="RealNum" DataField="RealNum" SortField="RealNum"
FieldType="String" HeaderText="到货量" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="到货量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
<f:RenderField Width="150px" ColumnID="StockNum" DataField="StockNum" SortField="StockNum"
FieldType="String" HeaderText="库存量" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MatchRateString" DataField="MatchRateString" SortField="MatchRateString" <f:RenderField Width="150px" ColumnID="MatchRateString" DataField="MatchRateString" SortField="MatchRateString"
FieldType="String" HeaderText="匹配率" TextAlign="Left" HeaderTextAlign="Center"> FieldType="String" HeaderText="匹配率" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField> </f:RenderField>
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.CLGL
{ {
var tb = BLL.TwArrivalStatisticsService.GetStatistics(this.CurrUser.LoginProjectId, txtMaterialCode.Text.Trim()); var tb = BLL.TwArrivalStatisticsService.GetStatistics(this.CurrUser.LoginProjectId, txtMaterialCode.Text.Trim());
lbRate.Text="匹配率："+ Math.Round( tb.Sum(x=>x.MatchRate)*100/tb.Count() ,4) + "%"; lbRate.Text="总体匹配率："+ Math.Round( tb.Sum(x=>x.MatchRate)*100/tb.Count() ,4) + "%";
//tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb; Grid1.DataSource = tb;
Grid1.DataBind(); Grid1.DataBind();
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx
+1 -1
View File
@@ -42,7 +42,7 @@
<f:DropDownList ID="drpWarehouse" runat="server" Label="仓库" <f:DropDownList ID="drpWarehouse" runat="server" Label="仓库"
LabelWidth="70px" LabelAlign="Right" Width="170px"> LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList> </f:DropDownList>
<f:TextBox runat="server" ID="txtMatCode" Label="材料编码" LabelWidth="70px" LabelAlign="Right" Width="170px"></f:TextBox> <f:TextBox runat="server" ID="txtMatCode" Label="材料编码" LabelWidth="100px" LabelAlign="Right" Width="200px"></f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click"> <f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" Text="查询" OnClick="btnSearch_Click">
SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
+13 -13
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="09/27/2024 19:25:05" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/09/2024 16:33:27" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFs2jrQYFVq2iWHsAGhD/TS"/> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGKbA2Bx03EOue9PYrCFwa+"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true"> <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/> <Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/>
<Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/> <Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/>
@@ -137,26 +137,26 @@ namespace FastReport
<Parameter Name="ConUnit" DataType="System.String"/> <Parameter Name="ConUnit" DataType="System.String"/>
<Parameter Name="CheckUnit" DataType="System.String"/> <Parameter Name="CheckUnit" DataType="System.String"/>
</Dictionary> </Dictionary>
<ReportPage Name="Page1" RawPaperSize="9" TopMargin="0" BottomMargin="0" MirrorMargins="true"> <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="0" TopMargin="0" RightMargin="0" BottomMargin="0" MirrorMargins="true" Columns.Count="2" Columns.Width="105" Columns.Positions="0,105">
<PageHeaderBand Name="PageHeader1" Width="718.2"/> <PageHeaderBand Name="PageHeader1" Width="793.8"/>
<DataBand Name="Data1" Top="4" Width="718.2" Height="280.48" Guides="198.45" DataSource="Table1" Columns.Count="1"> <DataBand Name="Data1" Top="4" Width="396.9" Height="224.53" Guides="198.45" DataSource="Table1" Columns.Count="1">
<TableObject Name="Table2" Left="18.9" Width="500.86" Height="233.1" Border.Lines="All"> <TableObject Name="Table2" Left="18.9" Top="18.9" Width="359.1" Height="186.72" Border.Lines="All">
<TableColumn Name="Column3" Width="231.52"/> <TableColumn Name="Column3" Width="160.64"/>
<TableColumn Name="Column1" Width="269.34"/> <TableColumn Name="Column1" Width="198.46"/>
<TableRow Name="Row1" Height="37.17"> <TableRow Name="Row1" Height="21.71">
<TableCell Name="Cell23" Text="管线号：[Table1.pipelineCode]" VertAlign="Center" Font="宋体, 11pt" ColSpan="2"/> <TableCell Name="Cell23" Text="管线号：[Table1.pipelineCode]" VertAlign="Center" Font="宋体, 11pt" ColSpan="2"/>
<TableCell Name="Cell1" VertAlign="Center" Font="宋体, 11pt"/> <TableCell Name="Cell1" VertAlign="Center" Font="宋体, 11pt"/>
</TableRow> </TableRow>
<TableRow Name="Row2" Height="37.17"> <TableRow Name="Row2" Height="21.71">
<TableCell Name="Cell24" Text="规格：[Table1.Spec]" VertAlign="Center" Font="宋体, 11pt"/> <TableCell Name="Cell24" Text="规格：[Table1.Spec]" VertAlign="Center" Font="宋体, 11pt"/>
<TableCell Name="Cell6" Text="材质：[Table1.Mat]" VertAlign="Center" Font="宋体, 11pt"/> <TableCell Name="Cell6" Text="材质：[Table1.Mat]" VertAlign="Center" Font="宋体, 11pt"/>
</TableRow> </TableRow>
<TableRow Name="Row5" Height="158.76"> <TableRow Name="Row5" Height="143.3">
<TableCell Name="Cell35"> <TableCell Name="Cell35">
<BarcodeObject Name="Barcode1" Left="22.68" Width="151.2" Height="151.2" AutoSize="false" Text="https://sggl.sedin.com.cn/StaticPage/HJGL/index.html?id=[Table1.WeldJointId]&amp;weldjoint=1" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/> <BarcodeObject Name="Barcode1" Left="3.78" Width="141.75" Height="141.75" AutoSize="false" Text="https://sggl.sedin.com.cn/StaticPage/HJGL/index.html?id=[Table1.WeldJointId]&amp;weldjoint=1" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
</TableCell> </TableCell>
<TableCell Name="Cell36" VertAlign="Center" Font="宋体, 11pt"> <TableCell Name="Cell36" VertAlign="Center" Font="宋体, 11pt">
<TextObject Name="Text1" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 72pt, style=Bold"/> <TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 72pt, style=Bold"/>
</TableCell> </TableCell>
</TableRow> </TableRow>
</TableObject> </TableObject>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+28 -11
View File
@@ -21,6 +21,18 @@
.tn-color-green .f-tree-folder { .tn-color-green .f-tree-folder {
color: green; color: green;
} }
.f-grid-row.yellow {
background-color: darkgoldenrod;
}
.f-grid-row.red {
background-color: red;
}
.f-grid-row.green {
background-color: green;
}
</style> </style>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head> </head>
@@ -47,10 +59,10 @@
<f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch" <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server"> EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
</f:Button> </f:Button>
<f:Button ID="btnStatisticsMat" ToolTip="匹配材料" Icon="TabGo" runat="server" OnClick="btnStatisticsMat_Click"> <f:Button ID="btnStatisticsMat" ToolTip="匹配材料" Icon="TabGo" runat="server" OnClick="btnStatisticsMat_Click" Hidden="true">
</f:Button> </f:Button>
<f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh" <f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh"
EnablePostBack="true" OnClick="btnrefresh_Click" runat="server"> EnablePostBack="true" OnClick="btnrefresh_Click" runat="server" Hidden="true">
</f:Button> </f:Button>
</Items> </Items>
@@ -65,7 +77,7 @@
</Items> </Items>
</f:Panel> </f:Panel>
<f:Panel runat="server" ID="panel3" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" <f:Panel runat="server" ID="panel3" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
Width="200px" Title="匹配中管线" ShowBorder="true" ShowHeader="true" Width="230px" Title="匹配中管线" ShowBorder="true" ShowHeader="true"
BodyPadding="10px"> BodyPadding="10px">
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar4" Position="Bottom" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar4" Position="Bottom" runat="server" ToolbarAlign="Left">
@@ -73,9 +85,8 @@
<f:Button ID="btnAddPipelineMatchMat" Icon="Add" runat="server" OnClick="btnAddPipelineMatchMat_Click"> <f:Button ID="btnAddPipelineMatchMat" Icon="Add" runat="server" OnClick="btnAddPipelineMatchMat_Click">
</f:Button> </f:Button>
<f:Button ID="btnDeletePipelineMatchMat" Icon="Delete" runat="server" OnClick="btnDeletePipelineMatchMat_Click"> <f:Button ID="btnDeletePipelineMatchMat" Icon="Delete" runat="server" OnClick="btnDeletePipelineMatchMat_Click">
</f:Button>
<f:Button ID="btnGenTask" ToolTip="生成任务单" Icon="ApplicationViewIcons" runat="server" OnClick="btnGenTask_Click" ConfirmText="确定生成任务单吗？">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
@@ -83,7 +94,7 @@
<f:Grid ID="Grid3" ShowBorder="false" ShowHeader="false" runat="server" EnableCollapse="false" <f:Grid ID="Grid3" ShowBorder="false" ShowHeader="false" runat="server" EnableCollapse="false"
DataKeyNames="Key" DataIDField="Key" ShowGridHeader="false" EnableRowLines="false" EnableAlternateRowColor="false"> DataKeyNames="Key" DataIDField="Key" ShowGridHeader="false" EnableRowLines="false" EnableAlternateRowColor="false">
<Columns> <Columns>
<f:RenderField Width="150px" ColumnID="Value" DataField="Value" SortField="Value" <f:RenderField Width="200px" ColumnID="Value" DataField="Value" SortField="Value"
FieldType="String" HeaderText="管线" HeaderTextAlign="Center" FieldType="String" HeaderText="管线" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
</f:RenderField> </f:RenderField>
@@ -96,7 +107,7 @@
<Items> <Items>
<f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" ShowBorder="true" RegionPercent="30%" IsFluid="true" <f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" ShowBorder="true" RegionPercent="30%" IsFluid="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型" Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" AutoScroll="true" IFrameUrl="../../CLGL/MaterialStock.aspx" EnableIFrame="true"> TitleToolTip="三维模型显示" AutoScroll="true" IFrameUrl="../../CLGL/ArrivalStatistics.aspx" EnableIFrame="true">
</f:Panel> </f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="40%" <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="40%"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型" Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
@@ -104,16 +115,22 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
<f:Label ID="lbRate" runat="server" LabelWidth="100px"></f:Label> <f:Label ID="lbRate" runat="server" LabelWidth="100px" Hidden="true"></f:Label>
<f:Button ID="btnGenTask" ToolTip="生成任务单" Icon="ApplicationViewIcons" runat="server" OnClick="btnGenTask_Click" ConfirmText="确定生成任务单吗？">
</f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Items> <Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="材料匹配" EnableRowClickEvent="true" <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="材料匹配" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" ForceFit="true" EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" ForceFit="true"
EnableColumnLines="true" DataIDField="PipelineId" AllowSorting="true" OnRowClick="Grid2_RowClick" EnableColumnLines="true" DataIDField="PipelineId" AllowSorting="true" OnRowClick="Grid2_RowClick"
SortField="PipelineId" SortDirection="ASC"> SortField="PipelineId" SortDirection="ASC" EnableCheckBoxSelect="true" >
<Columns> <Columns>
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
FieldType="String" HeaderText="主项" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode" <f:RenderField Width="150px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center" FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
@@ -131,7 +148,7 @@
Title="底部面板" ShowBorder="false" Height="320px" ShowHeader="false" BodyPadding="1px" Layout="Fit"> Title="底部面板" ShowBorder="false" Height="320px" ShowHeader="false" BodyPadding="1px" Layout="Fit">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true" EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true"
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound" EnableColumnLines="true" DataIDField="Id" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort"> SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort">
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+77 -25
View File
@@ -1,5 +1,6 @@
using BLL; using BLL;
using Model; using Model;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@@ -14,6 +15,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//public Dictionary<string, string> dicSeclectPipeLine = new Dictionary<string, string>(); //public Dictionary<string, string> dicSeclectPipeLine = new Dictionary<string, string>();
public static List<Model.Tw_PipeMatMatchOutput> tw_PipeMatMatchOutputs ; public static List<Model.Tw_PipeMatMatchOutput> tw_PipeMatMatchOutputs ;
public static decimal Rate = 0; public static decimal Rate = 0;
public static string WarehouseCode = "工厂预制";
public string PipeArea public string PipeArea
{ {
get get
@@ -54,6 +56,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
tw_PipeMatMatchOutputs=new List<Model.Tw_PipeMatMatchOutput>(); tw_PipeMatMatchOutputs=new List<Model.Tw_PipeMatMatchOutput>();
PipeArea = Request.Params["PipeArea"]; PipeArea = Request.Params["PipeArea"];
if (PipeArea == "2")
{
WarehouseCode = "现场安装";
}
HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>(); HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>(); HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
dicSeclectPipeLine=new Dictionary<string, string>(); dicSeclectPipeLine=new Dictionary<string, string>();
@@ -168,18 +174,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
private void BindNodes(TreeNode node) private void BindNodes(TreeNode node)
{ {
var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(node.NodeID); //var NowComPipelineCode = PipelineService.GetNoComPipelinesByUnitWordId(node.NodeID);
if (!node.Text.Contains("|")) //if (!node.Text.Contains("|"))
{ //{
node.Text += "|" + NowComPipelineCode.Count(); // node.Text += "|" + NowComPipelineCode.Count();
//}
var CompleteInOutPlanDetail_RelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
where y.State==(int)TwConst.State.已完成 && y.WarehouseCode == WarehouseCode
select x;
}
var pipeline = (from x in Funs.DB.HJGL_Pipeline var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID join y in CompleteInOutPlanDetail_RelationList on x.PipelineId equals y.PipelineId into temp
from y in temp.DefaultIfEmpty()
where y == null && x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
orderby x.PipelineCode orderby x.PipelineCode
select x).ToList(); select x).ToList();
pipeline= pipeline.Where(x => NowComPipelineCode.Contains(x.PipelineCode)).ToList(); //pipeline= pipeline.Where(x => NowComPipelineCode.Contains(x.PipelineCode)).ToList();
if (!node.Text.Contains("|"))
{
node.Text += "|" + pipeline.Count();
}
int pageindex = int.Parse(node.CommandName.Split('|')[0]); int pageindex = int.Parse(node.CommandName.Split('|')[0]);
int pageCount = int.Parse(node.CommandName.Split('|')[1]); int pageCount = int.Parse(node.CommandName.Split('|')[1]);
if (pageindex <= pageCount) if (pageindex <= pageCount)
@@ -274,11 +292,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
void BindGrid2() void BindGrid2()
{ {
var result = tw_PipeMatMatchOutputs var result = tw_PipeMatMatchOutputs
.GroupBy(item => new { item.PipelineId, item.PipelineCode }) // 按 PipelineId 和 PipelineCode 分组 .GroupBy(item => new { item.PipelineId, item.PipelineCode,item.UnitWorkName }) // 按 PipelineId 和 PipelineCode 分组
.Select(group => new .Select(group => new
{ {
PipelineId = group.Key.PipelineId, // 当前组的 PipelineId PipelineId = group.Key.PipelineId, // 当前组的 PipelineId
PipelineCode = group.Key.PipelineCode, // 当前组的 PipelineCode PipelineCode = group.Key.PipelineCode, // 当前组的 PipelineCode
UnitWorkName = group.Key.UnitWorkName, // 当前组的 UnitWorkName
AverageMatchRate = group.Average(item => item.MatchRate) // 计算平均 MatchRate AverageMatchRate = group.Average(item => item.MatchRate) // 计算平均 MatchRate
}) })
.ToList(); // 转换为 List .ToList(); // 转换为 List
@@ -287,14 +306,34 @@ namespace FineUIPro.Web.HJGL.WeldingManage
List<Tw_PipeMatMatchOutput> output = result.Select(r => new Tw_PipeMatMatchOutput List<Tw_PipeMatMatchOutput> output = result.Select(r => new Tw_PipeMatMatchOutput
{ {
PipelineId = r.PipelineId, PipelineId = r.PipelineId,
PipelineCode = r.PipelineCode, PipelineCode = r.PipelineCode,
UnitWorkName = r.UnitWorkName,
MatchRate = r.AverageMatchRate, MatchRate = r.AverageMatchRate,
MatchRateString = Math.Round((decimal)r.AverageMatchRate * 100, 2).ToString() + "%" MatchRateString = Math.Round((decimal)r.AverageMatchRate * 100, 2).ToString() + "%"
}).ToList(); }).ToList();
Grid2.DataSource = output; Grid2.DataSource = output;
Grid2.DataBind(); Grid2.DataBind();
Rate = Math.Round((decimal)output.Average(item => item.MatchRate) * 100, 2); if (output.Any())
lbRate.Text = "匹配率：" + Rate.ToString() + "%"; {
Rate = Math.Round((decimal)output.Average(item => item.MatchRate) * 100, 2);
lbRate.Text = "匹配率：" + Rate.ToString() + "%";
}
for (int i = 0; i < Grid2.Rows.Count; i++)
{
var model = Grid2.Rows[i].DataItem as Tw_PipeMatMatchOutput;
if (model.MatchRate >=1)
{
Grid2.Rows[i].RowCssClass = "green";
}
else
{
Grid2.Rows[i].RowCssClass = "red";
}
}
} }
void BindGrid3() void BindGrid3()
@@ -302,6 +341,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Grid3.DataSource = dicSeclectPipeLine; Grid3.DataSource = dicSeclectPipeLine;
Grid3.DataBind(); Grid3.DataBind();
for (int i = 0; i < Grid3.Rows.Count; i++)
{
var model = Grid3.Rows[i].DataItem ;
var model2= JsonConvert.DeserializeObject<Dictionary<string, string>>(JsonConvert.SerializeObject(model));
string pipeid= model2.First().Value;
var relationModle=TwInoutplandetailRelationService.GetByPipelineId(pipeid,WarehouseCode);
if (relationModle!= null)
{
Grid3.Rows[i].RowCssClass = "yellow";
}
}
} }
#endregion #endregion
@@ -371,10 +423,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
#endregion #endregion
#region 按钮事件 #region 按钮事件
protected void btnNew_Click(object sender, EventArgs e)
{
}
protected void btnrefresh_Click(object sender, EventArgs e) protected void btnrefresh_Click(object sender, EventArgs e)
{ {
@@ -459,7 +507,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (dicSeclectPipeLine.Where(x => x.Key == this.tvControlItem.SelectedNodeID).Count() == 0) if (dicSeclectPipeLine.Where(x => x.Key == this.tvControlItem.SelectedNodeID).Count() == 0)
{ {
dicSeclectPipeLine.Add(this.tvControlItem.SelectedNodeID, this.tvControlItem.SelectedNode.Text); dicSeclectPipeLine.Add(this.tvControlItem.SelectedNodeID, this.tvControlItem.SelectedNode.Text);
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), "工厂预制"); tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), WarehouseCode);
BindGrid3(); BindGrid3();
BindGrid2(); BindGrid2();
@@ -472,31 +520,35 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (Grid3.SelectedRowID != "") if (Grid3.SelectedRowID != "")
{ {
dicSeclectPipeLine.Remove(Grid3.SelectedRowID); dicSeclectPipeLine.Remove(Grid3.SelectedRowID);
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), "工厂预制"); tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), WarehouseCode);
BindGrid3(); BindGrid3();
BindGrid2(); BindGrid2();
} }
} }
protected void btnGenTask_Click(object sender, EventArgs e) protected void btnGenTask_Click(object sender, EventArgs e)
{ { if (Grid2.SelectedRowIDArray.Count() > 0)
if (Rate<(decimal)85)
{ {
ShowNotify(" 匹配率小于85%，请重新匹配！", MessageBoxIcon.Warning); SaveTask();
return; Response.Redirect(Request.Url.ToString());
ShowNotify("生成任务单成功！", MessageBoxIcon.Warning);
} }
SaveTask(); else
Response.Redirect(Request.Url.ToString()); {
ShowNotify("请先选择需要发起任单的管线！", MessageBoxIcon.Warning);
}
} }
private void SaveTask() private void SaveTask()
{ {
var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x; var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x;
var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x; var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x;
var toDoMatterList = (from x in Funs.DB.View_HJGL_NoWeldJointFind var toDoMatterList = (from x in Funs.DB.View_HJGL_NoWeldJointFind
where dicSeclectPipeLine.Keys.ToList().Contains(x.PipelineId) && x.WeldingDailyId == null && x.WeldTaskId == null where Grid2.SelectedRowIDArray.ToList().Contains(x.PipelineId) && x.WeldingDailyId == null && x.WeldTaskId == null
select x).ToList(); select x).ToList();
var selectRowId = (from x in Funs.DB.View_HJGL_NoWeldJointFind var selectRowId = (from x in Funs.DB.View_HJGL_NoWeldJointFind
where dicSeclectPipeLine.Keys.ToList().Contains(x.PipelineId) && x.WeldingDailyId == null && x.WeldTaskId == null where Grid2.SelectedRowIDArray.ToList().Contains(x.PipelineId) && x.WeldingDailyId == null && x.WeldTaskId == null
select x).ToList(); select x).ToList();
foreach (var weldjoint in selectRowId) foreach (var weldjoint in selectRowId)
{ {
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
Generated
+9 -9
View File
@@ -158,15 +158,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnDeletePipelineMatchMat; protected global::FineUIPro.Button btnDeletePipelineMatchMat;
/// <summary>
/// btnGenTask 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGenTask;
/// <summary> /// <summary>
/// Grid3 控件。 /// Grid3 控件。
/// </summary> /// </summary>
@@ -221,6 +212,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Label lbRate; protected global::FineUIPro.Label lbRate;
/// <summary>
/// btnGenTask 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnGenTask;
/// <summary> /// <summary>
/// Grid2 控件。 /// Grid2 控件。
/// </summary> /// </summary>
SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs
+1
View File
@@ -13,6 +13,7 @@ namespace Model
public string MaterialSpec { get; set; } public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; } public string MaterialUnit { get; set; }
public string MaterialDef { get; set; } public string MaterialDef { get; set; }
public decimal StockNum { get; set; }
public decimal NeedNum { get; set; } public decimal NeedNum { get; set; }
public decimal RealNum { get; set; } public decimal RealNum { get; set; }
public decimal MatchRate { get; set; } public decimal MatchRate { get; set; }
SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs
+2
View File
@@ -11,6 +11,8 @@ namespace Model
public string Id { get; set; } public string Id { get; set; }
public string PipelineId { get; set; } public string PipelineId { get; set; }
public string PipelineCode { get; set; } public string PipelineCode { get; set; }
public string UnitWorkId { get; set; }
public string UnitWorkName { get; set; }
public string PrefabricatedComponents { get; set; } public string PrefabricatedComponents { get; set; }
public string MaterialCode { get; set; } public string MaterialCode { get; set; }
public string MaterialName { get; set; } public string MaterialName { get; set; }