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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+17 -20
View File
@@ -1,7 +1,4 @@
using BLL;
using FastReport.Design;
using FineUIPro.Web.HJGL.WeldingManage;
using FineUIPro.Web.ProjectData;
using System;
using System.Collections.Generic;
using System.Data;
@@ -28,7 +25,7 @@ namespace FineUIPro.Web.HJGL.DataImport
//{
// this.GetShowColumn(c.Columns);
//}
}
}
@@ -84,8 +81,8 @@ namespace FineUIPro.Web.HJGL.DataImport
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
//var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x;
//var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
@@ -94,7 +91,7 @@ namespace FineUIPro.Web.HJGL.DataImport
foreach (var q in unitWork1)
{
string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
strSql += "where [t0].[UnitWorkId] =@UnitWorkId ";
strSql += "where [t0].[UnitWorkId] =@UnitWorkId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
@@ -162,7 +159,7 @@ namespace FineUIPro.Web.HJGL.DataImport
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
var a =dt.Rows.Count;
var a = dt.Rows.Count;
//var b = (from x in Funs.DB.HJGL_Pipeline
// join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
@@ -208,7 +205,7 @@ namespace FineUIPro.Web.HJGL.DataImport
#region 暂不有
private void BindNodes(TreeNode node)
{
BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(),txtMaterialCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), txtMaterialCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
}
#endregion
@@ -220,7 +217,7 @@ namespace FineUIPro.Web.HJGL.DataImport
BindNodes(e.Node);
}
}
@@ -244,7 +241,7 @@ namespace FineUIPro.Web.HJGL.DataImport
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
@@ -264,7 +261,7 @@ namespace FineUIPro.Web.HJGL.DataImport
TabStrip1.ActiveTabIndex = 1;
}
}
}
}
@@ -278,7 +275,7 @@ namespace FineUIPro.Web.HJGL.DataImport
/// <summary>
/// 管线数据
/// </summary>
private void BindGrid1(string pipelineId,string unitworkid)
private void BindGrid1(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
lib.MaterialSpec,lib.MaterialMade,lib.MaterialDef,pipe.Number,pipe.PrefabricatedComponents
@@ -301,7 +298,7 @@ namespace FineUIPro.Web.HJGL.DataImport
if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
{
strSql += " and lib.MaterialCode like @MaterialCode ";
listStr.Add(new SqlParameter("@MaterialCode","%"+ txtMaterialCode2.Text.Trim()+"%"));
listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode2.Text.Trim() + "%"));
}
strSql += " order by PrefabricatedComponents ";
@@ -389,7 +386,7 @@ namespace FineUIPro.Web.HJGL.DataImport
protected void Grid2_Sort(object sender, GridSortEventArgs e)
{
BindGrid2(this.tvControlItem.SelectedNodeID,this.hdUnitWorkId.Text);
BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
}
/// <summary>
/// 排序
@@ -448,7 +445,7 @@ namespace FineUIPro.Web.HJGL.DataImport
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
}
}
/// <summary>
/// 增加焊口信息
@@ -486,7 +483,7 @@ namespace FineUIPro.Web.HJGL.DataImport
#region 右键菜单删除
protected void btnDelMatGrid2_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
@@ -674,7 +671,7 @@ namespace FineUIPro.Web.HJGL.DataImport
protected void Window5_Close(object sender, WindowCloseEventArgs e)
{
// this.BindGrid1(this.tvControlItem.SelectedNodeID);
// this.BindGrid1(this.tvControlItem.SelectedNodeID);
}
/// <summary>
@@ -699,13 +696,13 @@ namespace FineUIPro.Web.HJGL.DataImport
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
string pipelineid = "";
if (this.tvControlItem.SelectedNode != null&& this.tvControlItem.SelectedNode.CommandName != "单位工程")
if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.CommandName != "单位工程")
{
pipelineid = this.tvControlItem.SelectedNodeID;
}
if (this.TabStrip1.ActiveTabIndex == 0)
{
BindGrid1(pipelineid, this.hdUnitWorkId.Text);
}