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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CLGL/TwArrivalStatisticsService.cs
+9
View File
@@ -70,6 +70,9 @@ namespace BLL
StockNum = m == null ? 0 : (decimal)m.StockNum,
NeedNum = x == null ? 0 : x.NeedNum,
RealNum = y == null ? 0 : y.RealNum,
Code = z == null ? null : z.Code,
HeatNo = z == null ? null : z.HeatNo,
BatchNo = z == null ? null : z.BatchNo,
MaterialName = z == null ? null : z.MaterialName,
MaterialSpec = z == null ? null : z.MaterialSpec,
MaterialUnit = z == null ? null : z.MaterialUnit,
@@ -213,6 +216,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
PipelineCode = z.PipelineCode,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
@@ -261,6 +267,9 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc
UnitWorkName = m.UnitWorkName,
PrefabricatedComponents = x.PrefabricatedComponents,
MaterialCode = x.MaterialCode,
Code = y.Code,
HeatNo = y.HeatNo,
BatchNo = y.BatchNo,
MaterialName = y.MaterialName,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs
+8 -2
View File
@@ -66,6 +66,9 @@ namespace BLL
y.PipelineCode,
x.InOutPlanMasterId,
x.MaterialCode,
Code = mat.Code,
mat.HeatNo,
mat.BatchNo,
x.PrefabricatedComponents,
x.Number,
mat.MaterialName,
@@ -219,7 +222,10 @@ namespace BLL
出库单编号 = master.CusBillCode,
管线号 = pipe.PipelineCode,
预制组件号 = x.PrefabricatedComponents,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
单位 = y.MaterialUnit,
@@ -228,4 +234,4 @@ namespace BLL
return q;
}
}
}
}
SGGL/BLL/CLGL/TwInOutplandetailService.cs
+3 -2
View File
@@ -42,7 +42,8 @@ namespace BLL
Id = x.Id,
InOutPlanMasterId = x.InOutPlanMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = mat.Code,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = x.HeatNo,
BatchNo = x.BatchNo,
PlanNum = x.PlanNum,
@@ -200,4 +201,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs
+3
View File
@@ -45,6 +45,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
CusBillCode = master.CusBillCode,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialDef = mat.MaterialDef,
BarCode = x.BarCode
SGGL/BLL/CLGL/TwInputdetailService.cs
+7 -1
View File
@@ -40,6 +40,9 @@ namespace BLL
InputMasterId = x.InputMasterId,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -135,7 +138,10 @@ namespace BLL
select new
{
入库单编号 = y.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = mat.Code,
炉号 = mat.HeatNo,
批号 = mat.BatchNo,
材料名称 = mat.MaterialName,
材料描述 = mat.MaterialDef,
计划数量 = x.PlanNum,
SGGL/BLL/CLGL/TwMaterialstockService.cs
+4 -1
View File
@@ -42,6 +42,9 @@ namespace BLL
PipeLineMatCode = x.PipeLineMatCode,
StockNum = x.StockNum,
ProjectId = x.ProjectId,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
MaterialName = mat.MaterialName,
MaterialSpec = mat.MaterialSpec,
MaterialUnit = mat.MaterialUnit,
@@ -158,4 +161,4 @@ namespace BLL
}
}
}
}
}
SGGL/BLL/CLGL/TwOutputdetailService..cs
+8 -2
View File
@@ -44,6 +44,9 @@ namespace BLL
TypeInt = master.TypeInt,
PipelineComponentId = x.PipelineComponentId,
MaterialCode = x.MaterialCode,
Code = mat.Code,
HeatNo = mat.HeatNo,
BatchNo = mat.BatchNo,
PlanNum = x.PlanNum,
ActNum = x.ActNum,
PipelineComponentCode = y.PipelineComponentCode,
@@ -155,7 +158,10 @@ namespace BLL
select new
{
出库单编号 = master.CusBillCode,
材料编码 = x.MaterialCode,
材料主编码 = x.MaterialCode,
材料编码 = y.Code,
炉号 = y.HeatNo,
批号 = y.BatchNo,
材料名称 = y.MaterialName,
材料描述 = y.MaterialDef,
计划数量 = x.PlanNum,
@@ -165,4 +171,4 @@ namespace BLL
}
}
}
}
SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs
+8 -2
View File
@@ -108,6 +108,9 @@ namespace BLL
public static DataTable GetSHOPStockDt(string projectid)
{
string strSql = @" SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -157,7 +160,7 @@ namespace BLL
GROUP BY stockused.MaterialCode,stockused.MaterialName,stockused.MaterialUnit,stockused.MaterialSpec,stockused.MaterialMade ) AS aa
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@projectid
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num
";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -171,6 +174,9 @@ namespace BLL
{
string strSql = @"
SELECT mat.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -223,7 +229,7 @@ namespace BLL
ON mat.MaterialCode=aa.MaterialCode
WHERE mat.projectid=@Projectid
AND Ins.State=@State
GROUP BY mat.MaterialCode,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
GROUP BY mat.MaterialCode,lib.Code,lib.HeatNo,lib.BatchNo,lib.MaterialName,lib.MaterialSpec,lib.MaterialMade,lib.MaterialUnit,aa.num ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@Projectid", projectid));
listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP));
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx
+9
View File
@@ -61,8 +61,17 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
+5 -2
View File
@@ -158,8 +158,11 @@
<asp:Label ID="Label1" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" >
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
+3
View File
@@ -66,6 +66,9 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx
+18
View File
@@ -144,8 +144,17 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -179,8 +188,17 @@
FieldType="String" HeaderText="入库单编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx
+9
View File
@@ -65,8 +65,17 @@
FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PipeLineMatCode" DataField="PipeLineMatCode" SortField="PipeLineMatCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
+35 -2
View File
@@ -178,8 +178,17 @@
<Columns>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -211,10 +220,22 @@
FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" HeaderTextAlign="Center"
TextAlign="Left">
@@ -262,10 +283,22 @@
FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" HeaderTextAlign="Center"
TextAlign="Left">
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx
+18
View File
@@ -81,8 +81,17 @@
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
@@ -118,8 +127,17 @@
FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx
+9
View File
@@ -61,8 +61,17 @@
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx
+9
View File
@@ -87,8 +87,17 @@
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
+4 -1
View File
@@ -233,6 +233,9 @@ namespace FineUIPro.Web.CLGL
x.PipeLineMatId,
x.PipelineId,
x.MaterialCode,
lib.Code,
lib.HeatNo,
lib.BatchNo,
lib.MaterialName,
lib.MaterialSpec,
lib.MaterialUnit,
@@ -358,4 +361,4 @@ namespace FineUIPro.Web.CLGL
#endregion
}
}
}
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx
+9
View File
@@ -64,8 +64,17 @@
FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="PipeLineMatCode" DataField="PipeLineMatCode" SortField="PipeLineMatCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="类型" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
+9
View File
@@ -177,8 +177,17 @@
FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料主编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="Code" DataField="Code" SortField="Code"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HeatNo" DataField="HeatNo" SortField="HeatNo"
FieldType="String" HeaderText="炉号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="BatchNo" DataField="BatchNo" SortField="BatchNo"
FieldType="String" HeaderText="批号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
+3 -3
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+40 -4
View File
@@ -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">
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+3 -3
View File
@@ -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
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx
+13 -1
View File
@@ -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">
SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs
+3
View File
@@ -9,6 +9,9 @@ namespace Model
public class Tw_ArrivalStatisticsOutPut
{
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
SGGL/Model/CLGL/Tw_InOutDetailOutput.cs
+4
View File
@@ -17,6 +17,10 @@ namespace Model
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }
SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs
+3
View File
@@ -7,6 +7,9 @@ namespace Model
public string InputMasterId { get; set; }
public string CusBillCode { get; set; }
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialDef { get; set; }
public string BarCode { get; set; }
SGGL/Model/CLGL/Tw_MaterialStockOutput.cs
+4 -1
View File
@@ -2,9 +2,12 @@
{
public class Tw_MaterialStockOutput: Tw_MaterialStock
{
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialDef { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
}
}
}
SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs
+3
View File
@@ -17,6 +17,9 @@ namespace Model
public string UnitWorkName { get; set; }
public string PrefabricatedComponents { get; set; }
public string MaterialCode { get; set; }
public string Code { get; set; }
public string HeatNo { get; set; }
public string BatchNo { get; set; }
public string MaterialName { get; set; }
public string MaterialSpec { get; set; }
public string MaterialUnit { get; set; }
SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs
+13 -1
View File
@@ -9,10 +9,22 @@ namespace Model
public class MaterialStockItem
{
/// <summary>
/// 材料编码
/// 材料主编码
/// </summary>
public string MaterialCode { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 炉号
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 批号
/// </summary>
public string BatchNo { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }