feat(clgl): 完善材料匹配与入库条码查询

通过按材料编码优化库存匹配并增加条码查询入口,减少材料主编码选择歧义,便于按项目追溯入库条码。
This commit is contained in:
2026-09-16 15:47:51 +08:00
parent ffb9c2a95c
commit 9810280e42
14 changed files with 450 additions and 12 deletions
@@ -91,6 +91,10 @@
</f:Button>
<f:Button ID="btnMatImport" Text="材料导入" ToolTip="材料导入" Icon="PackageIn" runat="server" OnClick="btnMatImport_Click">
</f:Button>
<f:Button ID="btnCalibrateSharedMaterialCode" Text="校准共用材料编码"
ToolTip="批量校准选中管线的零数量材料,先查左侧相邻焊口,再查右侧"
runat="server" OnClick="btnCalibrateSharedMaterialCode_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
@@ -949,6 +949,34 @@ namespace FineUIPro.Web.HJGL.DataImport
this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
}
/// <summary>
/// 对选中管线的全部零数量材料校准主编码,不受列表筛选和勾选状态影响。
/// </summary>
protected void btnCalibrateSharedMaterialCode_Click(object sender, EventArgs e)
{
if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId,
Const.HJGL_WeldJointMenuId, Const.BtnModify))
{
ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
return;
}
var pipeline = PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
if (pipeline == null)
{
ShowNotify("请先选择需要校准的管线!", MessageBoxIcon.Warning);
return;
}
int count = PipelineMatService.CalibrateSharedMaterialCodes(pipeline.PipelineId);
this.hdUnitWorkId.Text = pipeline.UnitWorkId;
this.BindGrid1(pipeline.PipelineId, pipeline.UnitWorkId);
this.BindGrid2(pipeline.PipelineId, pipeline.UnitWorkId);
this.BindGrid3(pipeline.PipelineId, pipeline.UnitWorkId);
ShowNotify(string.Format("校准完成,共处理 {0} 条材料。", count), MessageBoxIcon.Success);
}
#region 管线材料导入
/// <summary>
@@ -185,6 +185,11 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </remarks>
protected global::FineUIPro.Button btnMatImport;
/// <summary>
/// 校准共用材料编码按钮。
/// </summary>
protected global::FineUIPro.Button btnCalibrateSharedMaterialCode;
/// <summary>
/// btnOut 控件。
/// </summary>