1
This commit is contained in:
@@ -253,6 +253,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
|
||||
this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid3(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
if (pipeline.PipeArea == PipelineService.PipeArea_SHOP)
|
||||
{
|
||||
TabStrip1.ActiveTabIndex = 0;
|
||||
@@ -284,7 +285,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.UnitWorkId=@UnitWorkId and line.PipeArea='1' ";
|
||||
WHERE line.UnitWorkId=@UnitWorkId and line.PipeArea='1' and pipe.PrefabricatedComponents !='' ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
//if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
|
||||
//{
|
||||
@@ -342,6 +343,43 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
Grid2.DataSource = dt;
|
||||
Grid2.DataBind();
|
||||
}
|
||||
|
||||
private void BindGrid3(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
|
||||
FROM dbo.HJGL_PipeLineMat pipe
|
||||
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
|
||||
LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
|
||||
WHERE line.UnitWorkId=@UnitWorkId and line.PipeArea='1' and (pipe.PrefabricatedComponents is null or pipe.PrefabricatedComponents='') ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
//if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
|
||||
//{
|
||||
// strSql += " and lib.MaterialCode like @MaterialCode ";
|
||||
// listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(pipelineId))
|
||||
{
|
||||
strSql += " and pipe.PipelineId=@PipelineId ";
|
||||
listStr.Add(new SqlParameter("@PipelineId", pipelineId));
|
||||
|
||||
}
|
||||
if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
|
||||
{
|
||||
strSql += " and lib.MaterialCode like @MaterialCode ";
|
||||
listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode2.Text.Trim() + "%"));
|
||||
|
||||
}
|
||||
strSql += " order by PrefabricatedComponents ";
|
||||
listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
// 2.获取当前分页数据
|
||||
Grid3.DataSource = dt;
|
||||
Grid3.DataBind();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region 分页排序
|
||||
@@ -471,6 +509,8 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
|
||||
this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid3(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -498,6 +538,8 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
|
||||
this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
this.BindGrid3(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -639,6 +681,11 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
{
|
||||
BindGrid2(pipelineid, this.hdUnitWorkId.Text);
|
||||
}
|
||||
else if (this.TabStrip1.ActiveTabIndex == 2)
|
||||
{
|
||||
BindGrid3(pipelineid, this.hdUnitWorkId.Text);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -937,8 +984,12 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
private void GetShowColumn(string column)
|
||||
{
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
protected void Grid3_Sort(object sender, GridSortEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user