补充材料编码和批次信息展示

This commit is contained in:
2026-05-27 17:57:11 +08:00
parent 33394e09ab
commit 729cf24338
30 changed files with 276 additions and 28 deletions
@@ -119,9 +119,21 @@
FieldType="String" HeaderText="预制组件" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
@@ -166,10 +178,22 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
@@ -211,10 +235,22 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
<f:RenderField HeaderText="材料编码" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材料编码" ColumnID="Code"
DataField="Code" SortField="Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="炉号" ColumnID="HeatNo"
DataField="HeatNo" SortField="HeatNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="批号" ColumnID="BatchNo"
DataField="BatchNo" SortField="BatchNo" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialSpec" DataField="MaterialSpec" SortField="MaterialSpec"
FieldType="String" HeaderText="规格" HeaderTextAlign="Center"
TextAlign="Left">
@@ -320,7 +320,7 @@ namespace FineUIPro.Web.HJGL.DataImport
/// </summary>
private void BindGrid1(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,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
@@ -355,7 +355,7 @@ namespace FineUIPro.Web.HJGL.DataImport
}
private void BindGrid2(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialUnit,
lib.MaterialSpec,lib.MaterialMade,lib.MaterialDef,pipe.Number
FROM dbo.HJGL_PipeLineMat pipe
LEFT JOIN dbo.HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode
@@ -386,7 +386,7 @@ namespace FineUIPro.Web.HJGL.DataImport
private void BindGrid3(string pipelineId, string unitworkid)
{
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.MaterialName,lib.MaterialUnit,
string strSql = @" SELECT pipe.PipeLineMatId, lib.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,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
@@ -34,9 +34,21 @@
</Toolbars>
<Columns>
<f:RenderField Width="200px" ColumnID="MaterialCode" DataField="MaterialCode"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialCode">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left" SortField="Code">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left" SortField="HeatNo">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left" SortField="BatchNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="MaterialNum" DataField="MaterialNum"
FieldType="String" HeaderText="数量" HeaderTextAlign="Center"
TextAlign="Left" SortField="MaterialNum">