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

feat(hjgl): 支持组件焊口导入和优先匹配

Browse Source 
组件与焊口关系需要参与材料匹配、任务生成和出库明细计算。
新增组件焊口导入入口，并允许在材料匹配时手动指定优先组件，
确保按组件范围生成任务单和领料数据。
This commit is contained in:
李鹏飞
2026-05-27 12:01:30 +08:00
parent 883493e02e
commit 49d59df7df
13 changed files with 841 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+15 -2
View File
@@ -240,7 +240,7 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
/// <param name="pipelineIds"></param>
/// <param name="warehouseCode"></param>
/// <returns></returns>
public static List<Tw_PipeMatMatchOutput> GetPipeMatMatch(string projectId, List<string> pipelineIds, string warehouseCode)
public static List<Tw_PipeMatMatchOutput> GetPipeMatMatch(string projectId, List<string> pipelineIds, string warehouseCode, Dictionary<string, List<string>> priorityComponents = null)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -271,7 +271,20 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
var newRequiredMaterials = new List<Tw_PipeMatMatchOutput>();
foreach (string id in pipelineIds)
{
newRequiredMaterials.AddRange(requiredMaterials.Where(x => x.PipelineId == id));
var pipelineMaterials = requiredMaterials.Where(x => x.PipelineId == id).ToList();
if (priorityComponents != null && priorityComponents.ContainsKey(id) && priorityComponents[id] != null && priorityComponents[id].Any())
{
var components = priorityComponents[id];
newRequiredMaterials.AddRange(pipelineMaterials
.Where(x => components.Contains(x.PrefabricatedComponents))
.OrderBy(x => components.IndexOf(x.PrefabricatedComponents)));
newRequiredMaterials.AddRange(pipelineMaterials
.Where(x => !components.Contains(x.PrefabricatedComponents)));
}
else
{
newRequiredMaterials.AddRange(pipelineMaterials);
}
}
results = GetMatMatchOutput(newRequiredMaterials, warehouseCode, projectId);
return results;
SGGL/BLL/CLGL/TwInOutplanmasterService.cs
+37 -14
View File
@@ -720,18 +720,41 @@ namespace BLL
return;
}
var pipelineList = db.View_HJGL_WeldingTask.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber).OrderBy(x => x.PipeLineSortIndex).Select(x => x.PipelineId).Distinct().ToList();
var taskWeldJointIds = db.View_HJGL_WeldingTask
.Where(e => e.UnitWorkId == unitworkid && e.UnitId == unitid && e.TaskDate.Value.Date == date.Date && e.SerialNumber == serialNumber && e.WeldJointId != null)
.Select(e => e.WeldJointId)
.Distinct()
.ToList();
var taskComponents = (from relation in db.HJGL_Pipeline_ComponentJoint
join component in db.HJGL_Pipeline_Component on relation.PipelineComponentId equals component.PipelineComponentId into componentJoin
from componentItem in componentJoin.DefaultIfEmpty()
join weldJointItem in db.HJGL_WeldJoint on relation.WeldJointId equals weldJointItem.WeldJointId
where taskWeldJointIds.Contains(relation.WeldJointId)
&& weldJointItem.PipelineId != null
&& (relation.PipelineComponentCode != null || (componentItem != null && componentItem.PipelineComponentCode != null))
select new
{
PipelineId = weldJointItem.PipelineId,
PipelineComponentCode = componentItem != null && componentItem.PipelineComponentCode != null ? componentItem.PipelineComponentCode : relation.PipelineComponentCode
}).Distinct().ToList();
//领料出库需要排除散件材料
var MaterDatial = from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null
select new
{
x.PipelineId,
x.PrefabricatedComponents,
x.MaterialCode,
x.Number,
y.MaterialUnit,
};
var allMaterDatial = (from x in db.HJGL_PipeLineMat
join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where pipelineList.Contains(x.PipelineId) && x.PrefabricatedComponents != null
select new
{
x.PipelineId,
x.PrefabricatedComponents,
x.MaterialCode,
x.Number,
y.MaterialUnit,
}).ToList();
var componentPipelineIds = taskComponents.Select(x => x.PipelineId).Distinct().ToList();
var MaterDatial = taskComponents.Any()
? allMaterDatial.Where(mat => !componentPipelineIds.Contains(mat.PipelineId)
|| taskComponents.Any(component => component.PipelineId == mat.PipelineId
&& component.PipelineComponentCode == mat.PrefabricatedComponents)).ToList()
: allMaterDatial;
//var outMateriaList = from x in db.HJGL_PipeLineMat
// join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
// where pipelineList.Contains(x.PipelineId)
@@ -787,7 +810,7 @@ namespace BLL
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
@@ -826,7 +849,7 @@ namespace BLL
};
TwInOutplandetailService.Add(detail);
}
var twinoutplandetailRelationList = MaterDatial.ToList().Select(x => new Tw_InOutPlanDetail_Relation
var twinoutplandetailRelationList = MaterDatial.Select(x => new Tw_InOutPlanDetail_Relation
{
PipelineId = x.PipelineId,
MaterialCode = x.MaterialCode,
@@ -841,4 +864,4 @@ namespace BLL
}
}
}
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="04/14/2026 16:15:36" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="05/26/2026 23:52:36" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRFvoS/O78nkZZeky9BsAtP/"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaXj7MTwVWd+W15ZHXWbvUTygn/8kT7Dd8PAtwcQdvSWlUEyCU1xPvJPbQKwTsqQwLM+O2fcBJVGvSTxsXNEsa1vy5JNdjQE5XXU2qh41PMt4c4Lp/j2o5C6htb8mS4/JfQOgej7CCf0JujCt3dJ+YxXEWyCrPCgKDiJnuZPz/cQN"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="PipelineComponentId" DataType="System.String"/>
<Column Name="PipelineComponentCode" DataType="System.String"/>
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+8
View File
@@ -1595,6 +1595,7 @@
<Content Include="HJGL\PreDesign\PackagingManageSelectStock.aspx" />
<Content Include="HJGL\PreDesign\PackagingManageView.aspx" />
<Content Include="HJGL\PreDesign\InstallList.aspx" />
<Content Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx" />
<Content Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx" />
<Content Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx" />
<Content Include="HJGL\PreDesign\TrainNumberManager.aspx" />
@@ -10891,6 +10892,13 @@
<Compile Include="HJGL\PreDesign\PrePipelineQRCodeIn.aspx.designer.cs">
<DependentUpon>PrePipelineQRCodeIn.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.cs">
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HJGL\PreDesign\PrePipelineComponentJointIn.aspx.designer.cs">
<DependentUpon>PrePipelineComponentJointIn.aspx</DependentUpon>
</Compile>
<Compile Include="HJGL\PreDesign\ProductionSchedulingPlan.aspx.cs">
<DependentUpon>ProductionSchedulingPlan.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+2
View File
@@ -88,6 +88,8 @@
</f:Button>
<f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
</f:Button>
<f:Button ID="btnImportComponentJoint" Text="导入组件焊口信息" ToolTip="导入组件焊口信息" Icon="PackageIn" runat="server" OnClick="btnImportComponentJoint_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+6
View File
@@ -653,6 +653,12 @@ if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineQRCodeIn.aspx?", "导入 - ")));
}
protected void btnImportComponentJoint_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PrePipelineComponentJointIn.aspx?", "导入 - ")));
}
protected void btnSinglePreview_Click(object sender, EventArgs e)
{
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
Generated
+9
View File
@@ -239,6 +239,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.Button btnImportQRCode;
/// <summary>
/// btnImportComponentJoint 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImportComponentJoint;
/// <summary>
/// btnBatchAdd 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx
+89
View File
@@ -0,0 +1,89 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PrePipelineComponentJointIn.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreDesign.PrePipelineComponentJointIn" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<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="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdFileName" runat="server">
</f:HiddenField>
<f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" Text="下载模板" OnClick="btnDownLoad_Click" EnablePostBack="true" EnableAjax="false">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" Text="审核" ValidateForms="SimpleForm1"
OnClick="btnAudit_Click">
</f:Button>
<f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" Text="导入" ValidateForms="SimpleForm1"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Rows>
<f:FormRow>
<Items>
<f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
LabelWidth="150px">
</f:FileUpload>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件焊口信息"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC"
AllowPaging="true" IsDatabasePaging="true" PageSize="15"
EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="180px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="PipelineComponentCode" DataField="PipelineComponentCode" SortField="PipelineComponentCode"
FieldType="String" HeaderText="预制组件" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode"
FieldType="String" HeaderText="焊口号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<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" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx.cs
+336
View File
@@ -0,0 +1,336 @@
using BLL;
using MiniExcelLibs;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PrePipelineComponentJointIn : PageBase
{
private string initPath = Const.ExcelUrl;
public static List<ComponentJointImportItem> ComponentJointList = new List<ComponentJointImportItem>();
public static string errorInfos = string.Empty;
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.hdFileName.Text = string.Empty;
if (ComponentJointList != null)
{
ComponentJointList.Clear();
}
errorInfos = string.Empty;
}
}
protected void btnAudit_Click(object sender, EventArgs e)
{
try
{
if (this.fuAttachUrl.HasFile == false)
{
ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
return;
}
string isXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
if (isXls != ".xlsx")
{
ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
return;
}
ComponentJointList.Clear();
errorInfos = string.Empty;
string rootPath = Server.MapPath("~/");
string initFullPath = rootPath + initPath;
if (!Directory.Exists(initFullPath))
{
Directory.CreateDirectory(initFullPath);
}
this.hdFileName.Text = BLL.Funs.GetNewFileName() + isXls;
string filePath = initFullPath + this.hdFileName.Text;
this.fuAttachUrl.PostedFile.SaveAs(filePath);
ImportXlsToData(filePath);
}
catch (Exception ex)
{
Alert alert = new Alert
{
Message = "'" + ex.Message + "'",
Target = Target.Self
};
alert.Show();
}
}
private void ImportXlsToData(string fileName)
{
var rows = MiniExcel.QueryAsDataTable(fileName, useHeaderRow: true);
Model.ResponeData responeData = AddDatasetToSQL(rows, 3);
if (responeData.code == 1)
{
ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
}
else
{
Alert alert = new Alert
{
Message = responeData.message,
Target = Target.Self
};
alert.Show();
}
}
private Model.ResponeData AddDatasetToSQL(DataTable pds, int cols)
{
Model.ResponeData responeData = new Model.ResponeData();
List<string> result = new List<string>();
if (pds == null)
{
responeData.code = 0;
responeData.message = "导入数据为空！";
return responeData;
}
int ic = pds.Columns.Count;
int ir = pds.Rows.Count;
if (ic < cols || !pds.Columns.Contains("管线号") || !pds.Columns.Contains("预制组件") || !pds.Columns.Contains("焊口号"))
{
responeData.code = 0;
responeData.message = "导入Excel格式错误！模板列必须包含：管线号、预制组件、焊口号";
return responeData;
}
if (ir == 0)
{
responeData.code = 0;
responeData.message = "导入数据为空！";
return responeData;
}
var getPipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
List<ComponentJointImportItem> importItems = new List<ComponentJointImportItem>();
for (int i = 0; i < ir; i++)
{
string pipelineCode = GetCellValue(pds.Rows[i], "管线号");
string pipelineComponentCode = GetCellValue(pds.Rows[i], "预制组件");
string weldJointCode = GetCellValue(pds.Rows[i], "焊口号");
if (string.IsNullOrEmpty(pipelineCode) && string.IsNullOrEmpty(pipelineComponentCode) && string.IsNullOrEmpty(weldJointCode))
{
continue;
}
if (string.IsNullOrEmpty(pipelineCode))
{
result.Add("第" + (i + 2).ToString() + "行,管线号,此项为必填项！");
continue;
}
if (string.IsNullOrEmpty(pipelineComponentCode))
{
result.Add("第" + (i + 2).ToString() + "行,预制组件,此项为必填项！");
continue;
}
if (string.IsNullOrEmpty(weldJointCode))
{
result.Add("第" + (i + 2).ToString() + "行,焊口号,此项为必填项！");
continue;
}
var pipeline = getPipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode);
if (pipeline == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此管线号-" + pipelineCode);
continue;
}
var pipelineComponent = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(pipelineComponentCode, pipeline.PipelineId);
if (pipelineComponent == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此预制组件-" + pipelineComponentCode);
continue;
}
var weldJoint = WeldJointService.GetWeldJointsByWeldJointCode(pipeline.PipelineId, weldJointCode);
if (weldJoint == null)
{
result.Add("第" + (i + 2).ToString() + "行,不存在此焊口号-" + weldJointCode);
continue;
}
importItems.Add(new ComponentJointImportItem
{
PipelineId = pipeline.PipelineId,
PipelineCode = pipeline.PipelineCode,
PipelineComponentId = pipelineComponent.PipelineComponentId,
PipelineComponentCode = pipelineComponent.PipelineComponentCode,
WeldJointId = weldJoint.WeldJointId,
WeldJointCode = weldJoint.WeldJointCode
});
}
var conflictWeldJoints = importItems
.GroupBy(x => x.WeldJointId)
.Where(x => x.Select(y => y.PipelineComponentId).Distinct().Count() > 1)
.Select(x => x.First().PipelineCode + "-" + x.First().WeldJointCode)
.ToList();
if (conflictWeldJoints.Count > 0)
{
result.Add("同一焊口不能导入到多个组件：" + string.Join("、", conflictWeldJoints));
}
if (result.Count > 0)
{
ComponentJointList.Clear();
errorInfos = string.Join("|", result.Distinct());
responeData.code = 0;
responeData.message = errorInfos;
return responeData;
}
ComponentJointList = importItems
.GroupBy(x => new { x.PipelineComponentId, x.WeldJointId })
.Select(x => x.First())
.ToList();
errorInfos = string.Empty;
responeData.code = ComponentJointList.Count > 0 ? 1 : 0;
responeData.message = ComponentJointList.Count > 0 ? string.Empty : "导入数据为空！";
return responeData;
}
protected void btnImport_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(errorInfos))
{
if (!string.IsNullOrEmpty(this.hdFileName.Text))
{
if (ComponentJointList.Count > 0)
{
this.Grid1.Hidden = false;
this.Grid1.DataIDField = "WeldJointId";
this.Grid1.DataSource = ComponentJointList;
this.Grid1.DataBind();
Grid1.RecordCount = ComponentJointList.Count;
}
}
else
{
ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(errorInfos))
{
ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
return;
}
if (ComponentJointList.Count > 0)
{
foreach (var item in ComponentJointList)
{
var componentJoint = BLL.HJGL_PipelineComponentjointService.GetHJGL_Pipeline_ComponentJointByWeldJointId(item.WeldJointId);
if (componentJoint != null)
{
componentJoint.PipelineComponentCode = item.PipelineComponentCode;
componentJoint.PipelineComponentId = item.PipelineComponentId;
componentJoint.WeldJointCode = item.WeldJointCode;
componentJoint.WeldJointId = item.WeldJointId;
HJGL_PipelineComponentjointService.UpdateHJGL_Pipeline_ComponentJoint(componentJoint);
}
else
{
Model.HJGL_Pipeline_ComponentJoint newComponentJoint = new Model.HJGL_Pipeline_ComponentJoint();
newComponentJoint.Id = SQLHelper.GetNewID();
newComponentJoint.PipelineComponentCode = item.PipelineComponentCode;
newComponentJoint.PipelineComponentId = item.PipelineComponentId;
newComponentJoint.WeldJointCode = item.WeldJointCode;
newComponentJoint.WeldJointId = item.WeldJointId;
newComponentJoint.State = 0;
HJGL_PipelineComponentjointService.AddHJGL_Pipeline_ComponentJoint(newComponentJoint);
}
}
}
string rootPath = Server.MapPath("~/");
string filePath = rootPath + initPath + this.hdFileName.Text;
if (filePath != string.Empty && System.IO.File.Exists(filePath))
{
System.IO.File.Delete(filePath);
}
ShowNotify("导入成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
protected void btnDownLoad_Click(object sender, EventArgs e)
{
string rootPath = Server.MapPath("~/");
string tempDirectory = rootPath + @"File\Excel\Temp\";
if (!Directory.Exists(tempDirectory))
{
Directory.CreateDirectory(tempDirectory);
}
string tempPath = tempDirectory + "组件焊口信息导入模板" + string.Format("{0:yyyyMMddHHmmss}", DateTime.Now) + ".xlsx";
DataTable template = new DataTable();
template.Columns.Add("管线号");
template.Columns.Add("预制组件");
template.Columns.Add("焊口号");
MiniExcel.SaveAs(tempPath, template);
FileInfo info = new FileInfo(tempPath);
long fileSize = info.Length;
Response.ClearContent();
Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("组件焊口信息导入模板.xlsx", System.Text.Encoding.UTF8));
Response.ContentType = "excel/plain";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.AddHeader("Content-Length", fileSize.ToString().Trim());
Response.TransmitFile(tempPath, 0, fileSize);
Response.Flush();
Response.Close();
File.Delete(tempPath);
}
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
this.Grid1.DataSource = ComponentJointList;
this.Grid1.DataBind();
Grid1.RecordCount = ComponentJointList.Count;
}
private string GetCellValue(DataRow row, string columnName)
{
return Convert.ToString(row[columnName]).Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", "").Trim();
}
public class ComponentJointImportItem
{
public string PipelineId { get; set; }
public string PipelineCode { get; set; }
public string PipelineComponentId { get; set; }
public string PipelineComponentCode { get; set; }
public string WeldJointId { get; set; }
public string WeldJointCode { get; set; }
}
}
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineComponentJointIn.aspx.designer.cs
Generated
+143
View File
@@ -0,0 +1,143 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PrePipelineComponentJointIn
{
/// <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>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdFileName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// btnAudit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+10 -3
View File
@@ -34,6 +34,11 @@
background-color: green;
}
.f-grid-row.priority {
background-color: #1e88e5;
color: #fff;
}
.f-grid-row {
font-size: smaller;
}
@@ -138,7 +143,9 @@
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:Label ID="lbRate" runat="server" LabelWidth="100px" Hidden="true"></f:Label>
<f:Label ID="lbNote" runat="server" LabelWidth="100px" Text="绿色为匹配率100%，红色为匹配率小于100%"></f:Label>
<f:Label ID="lbNote" runat="server" LabelWidth="100px" Text="绿色为匹配率100%，红色为匹配率小于100%，蓝色为手动优先组件"></f:Label>
<f:Button ID="btnPriorityComponents" Text="优先匹配选中组件" Icon="TabGo" runat="server" OnClick="btnPriorityComponents_Click">
</f:Button>
<f:Button ID="btnGenTask" ToolTip="生成任务单" Icon="ApplicationViewIcons" runat="server" OnClick="btnGenTask_Click" ConfirmText="确定生成任务单吗？">
</f:Button>
<f:CheckBox ID="cbSelectCom" ShowLabel="false" runat="server" Text="默认勾选匹配100%" Checked="true">
@@ -174,9 +181,9 @@
<Items>
<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,PipelineId,PrefabricatedComponents" ForceFit="true"
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" OnRowDataBound="Grid1_RowDataBound"
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort">
SortField="Id" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true">
<Columns>
<f:RenderField Width="200px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderText="管线号" HeaderTextAlign="Center"
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+175 -26
View File
@@ -70,6 +70,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
public Dictionary<string, HashSet<string>> priorityComponents
{
get
{
var value = ViewState["priorityComponents"] as Dictionary<string, HashSet<string>>;
if (value == null)
{
value = new Dictionary<string, HashSet<string>>();
ViewState["priorityComponents"] = value;
}
return value;
}
set
{
ViewState["priorityComponents"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
@@ -86,6 +104,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
; HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
dicSeclectPipeLine = new Dictionary<string, string>();
priorityComponents = new Dictionary<string, HashSet<string>>();
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
select x.FlowingSection).Distinct().ToList();
@@ -464,23 +483,66 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}*/
}
protected void Grid2_RowClick(object sender, GridRowClickEventArgs e)
private void BindMaterialDetail(string pipelineId)
{
var tb = tw_PipeMatMatchOutputs.Where(x => x.PipelineId == Grid2.SelectedRowID).ToList();
var tb = tw_PipeMatMatchOutputs.Where(x => x.PipelineId == pipelineId).ToList();
Grid1.DataSource = tb;
Grid1.DataBind();
var selectList = new List<string>();
for (int i = 0; i < Grid1.Rows.Count; i++)
{
var model = Grid1.Rows[i].DataItem as Tw_PipeMatMatchOutput;
if (model?.MatchRate < 1 || model?.MatchRate == null)
if (model == null)
{
Grid1.Rows[i].RowCssClass = "red";
continue;
}
if (IsPriorityComponent(model.PipelineId, model.PrefabricatedComponents))
{
Grid1.Rows[i].RowCssClass = "priority";
selectList.Add(model.Id);
}
else if (model.MatchRate < 1 || model.MatchRate == null)
{
Grid1.Rows[i].RowCssClass = "red";
}
}
Grid1.SelectedRowIDArray = selectList.ToArray();
}
private bool IsPriorityComponent(string pipelineId, string prefabricatedComponents)
{
return !string.IsNullOrEmpty(pipelineId)
&& !string.IsNullOrEmpty(prefabricatedComponents)
&& priorityComponents.ContainsKey(pipelineId)
&& priorityComponents[pipelineId].Contains(prefabricatedComponents);
}
private Dictionary<string, List<string>> GetPriorityComponentList()
{
return priorityComponents
.Where(x => x.Value != null && x.Value.Any())
.ToDictionary(x => x.Key, x => x.Value.ToList());
}
private void RefreshMatchResult()
{
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(
this.CurrUser.LoginProjectId,
dicSeclectPipeLine.Keys.ToList(),
drpWarehouse.SelectedValue,
GetPriorityComponentList());
BindGrid3();
BindGrid2();
}
protected void Grid2_RowClick(object sender, GridRowClickEventArgs e)
{
BindMaterialDetail(Grid2.SelectedRowID);
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
@@ -520,7 +582,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid();
if (!string.IsNullOrEmpty(Grid2.SelectedRowID) && tw_PipeMatMatchOutputs != null && tw_PipeMatMatchOutputs.Any())
{
BindMaterialDetail(Grid2.SelectedRowID);
}
else
{
BindGrid();
}
}
#endregion
@@ -613,10 +682,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
dicSeclectPipeLine.Add(node.NodeID, node.Text);
}
}
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue);
BindGrid3();
BindGrid2();
RefreshMatchResult();
}
protected void btnDeletePipelineMatchMat_Click(object sender, EventArgs e)
@@ -626,6 +692,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
foreach (string rowId in Grid3.SelectedRowIDArray)
{
dicSeclectPipeLine.Remove(rowId);
priorityComponents.Remove(rowId);
var node = tvControlItem.FindNode(rowId);
if (node != null)
{
@@ -633,25 +700,63 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
tw_PipeMatMatchOutputs = TwArrivalStatisticsService.GetPipeMatMatch(this.CurrUser.LoginProjectId, dicSeclectPipeLine.Keys.ToList(), drpWarehouse.SelectedValue);
BindGrid3();
BindGrid2();
RefreshMatchResult();
}
}
protected void btnPriorityComponents_Click(object sender, EventArgs e)
{
string selectedPipelineId = Grid2.SelectedRowID;
if (string.IsNullOrEmpty(selectedPipelineId))
{
ShowNotify("请先在材料匹配列表选择管线！", MessageBoxIcon.Warning);
return;
}
var selectedComponents = new HashSet<string>();
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
if (Grid1.DataKeys[rowIndex].Length < 3)
{
continue;
}
string pipelineId = Grid1.DataKeys[rowIndex][1]?.ToString();
string componentCode = Grid1.DataKeys[rowIndex][2]?.ToString();
if (pipelineId == selectedPipelineId && !string.IsNullOrEmpty(componentCode))
{
selectedComponents.Add(componentCode);
}
}
if (selectedComponents.Any())
{
priorityComponents[selectedPipelineId] = selectedComponents;
}
else
{
priorityComponents.Remove(selectedPipelineId);
}
RefreshMatchResult();
BindMaterialDetail(selectedPipelineId);
}
protected void btnGenTask_Click(object sender, EventArgs e)
{
if (Grid2.SelectedRowIDArray.Count() > 0)
{
SaveTask();
ShowNotify("生成任务单成功！", MessageBoxIcon.Warning);
// Alert.Show("生成任务单成功！", MessageBoxIcon.Warning);
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
if (SaveTask())
{
ShowNotify("生成任务单成功！", MessageBoxIcon.Warning);
// Alert.Show("生成任务单成功！", MessageBoxIcon.Warning);
Grid1.DataSource = null;
Grid1.DataBind();
Grid2.DataSource = null;
Grid2.DataBind();
Grid3.DataSource = null;
Grid3.DataBind();
}
}
else
{
@@ -659,7 +764,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
private void SaveTask()
private bool SaveTask()
{
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;
@@ -679,6 +784,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
selectRowId = selectRowId.Where(x => x.JointAttribute == "预制口").ToList();
}
var priorityWeldJointIds = GetPriorityWeldJointIds(Grid2.SelectedRowIDArray.ToList());
if (priorityWeldJointIds.Any())
{
if (priorityWeldJointIds.Any(x => !x.Value.Any()))
{
ShowNotify("选中组件未找到关联焊口，无法按组件生成任务单！", MessageBoxIcon.Warning);
return false;
}
selectRowId = selectRowId.Where(x => !priorityWeldJointIds.ContainsKey(x.PipelineId) || priorityWeldJointIds[x.PipelineId].Contains(x.WeldJointId)).ToList();
}
if (!selectRowId.Any())
{
ShowNotify("未找到可生成任务单的焊口！", MessageBoxIcon.Warning);
return false;
}
foreach (var weldjoint in selectRowId)
{
string canWeldingRodName = string.Empty;
@@ -713,7 +833,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (oldWeldTask != null)
{
ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning);
return;
return false;
}
Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId);
if (weldJoint != null)
@@ -786,7 +906,36 @@ namespace FineUIPro.Web.HJGL.WeldingManage
BLL.WeldTaskService.AddWeldTask(NewTask);
}
return true;
}
private Dictionary<string, HashSet<string>> GetPriorityWeldJointIds(List<string> selectedPipelineIds)
{
var result = new Dictionary<string, HashSet<string>>();
var selectedPriority = priorityComponents
.Where(x => selectedPipelineIds.Contains(x.Key) && x.Value != null && x.Value.Any())
.ToList();
foreach (var item in selectedPriority)
{
string pipelineId = item.Key;
var componentCodes = item.Value.ToList();
var weldJointIds = (from joint in Funs.DB.HJGL_Pipeline_ComponentJoint
join weldJoint in Funs.DB.HJGL_WeldJoint on joint.WeldJointId equals weldJoint.WeldJointId
join component in Funs.DB.HJGL_Pipeline_Component on joint.PipelineComponentId equals component.PipelineComponentId into componentJoin
from componentItem in componentJoin.DefaultIfEmpty()
where joint.WeldJointId != null
&& weldJoint.PipelineId == pipelineId
&& ((componentItem != null && componentCodes.Contains(componentItem.PipelineComponentCode))
|| componentCodes.Contains(joint.PipelineComponentCode))
select joint.WeldJointId).Distinct().ToList();
result[pipelineId] = new HashSet<string>(weldJointIds);
}
return result;
}
private bool IsCoverClass(string wpsClass, string matClass)
{
bool isCover = false;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
Generated
+9
View File
@@ -257,6 +257,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks>
protected global::FineUIPro.Label lbNote;
/// <summary>
/// btnPriorityComponents 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPriorityComponents;
/// <summary>
/// btnGenTask 控件。
/// </summary>