20230220 003焊接修改

This commit is contained in:
2023-02-20 21:59:35 +08:00
parent e2edbb0f51
commit 8e8eecbcfc
28 changed files with 4507 additions and 348 deletions
@@ -191,9 +191,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
view_HJGL_Pipeline.DesignPress=this.txtDesignPress.Text.Trim();
// view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
// view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline);
if (!string .IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
{
list = (from x in list
join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
where y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
select x).Distinct().ToList();
}
view_HJGL_Pipelines = list;
// 2.获取当前分页数据
Grid1.RecordCount = list.Count();
@@ -364,8 +370,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
txtPipelineCode.Text = String.Empty;
txtSingleName.Text = String.Empty;
txtDesignPress.Text = String.Empty;
txtMaterialCode.Text = String.Empty;
txtMaterialCode.Text = String.Empty;
BindGrid();
}