From 729cf243383aa1cab06733798420bf2b63e9612d Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Wed, 27 May 2026 17:57:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9D=90=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 9 ++++ .../CLGL/TwInOutplandetailRelationService.cs | 10 ++++- SGGL/BLL/CLGL/TwInOutplandetailService.cs | 5 ++- SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs | 3 ++ SGGL/BLL/CLGL/TwInputdetailService.cs | 8 +++- SGGL/BLL/CLGL/TwMaterialstockService.cs | 5 ++- SGGL/BLL/CLGL/TwOutputdetailService..cs | 10 ++++- .../HJGL/PreDesign/HJGL_MaterialService.cs | 10 ++++- .../FineUIPro.Web/CLGL/ArrivalStatistics.aspx | 9 ++++ SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx | 7 ++- SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx | 3 ++ SGGL/FineUIPro.Web/CLGL/InputMaster.aspx | 18 ++++++++ SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx | 9 ++++ SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx | 37 +++++++++++++++- .../FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx | 18 ++++++++ SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx | 9 ++++ .../CLGL/OutPlanMasterSelect.aspx | 9 ++++ .../CLGL/OutPlanMasterSelect.aspx.cs | 5 ++- .../CLGL/OutPlanMasterSelectStock.aspx | 9 ++++ SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx | 9 ++++ .../File/Fastreport/材料入库单.frx | 6 +-- .../HJGL/DataImport/MaterialInformation.aspx | 44 +++++++++++++++++-- .../DataImport/MaterialInformation.aspx.cs | 6 +-- .../HJGL/DataImport/MaterialStock.aspx | 14 +++++- SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs | 3 ++ SGGL/Model/CLGL/Tw_InOutDetailOutput.cs | 4 ++ .../Model/CLGL/Tw_InputDetailBarCodeOutput.cs | 3 ++ SGGL/Model/CLGL/Tw_MaterialStockOutput.cs | 5 ++- SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs | 3 ++ .../PreDesign/Material/MaterialStockItem.cs | 14 +++++- 30 files changed, 276 insertions(+), 28 deletions(-) diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index 15542c32..896701d7 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -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, diff --git a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs index f8f618b1..ea011d04 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailRelationService.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs index 9d0868e8..aec9d136 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs @@ -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 } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs b/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs index 39b92a64..cec3453e 100644 --- a/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs +++ b/SGGL/BLL/CLGL/TwInputdetailBarCodeService.cs @@ -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 diff --git a/SGGL/BLL/CLGL/TwInputdetailService.cs b/SGGL/BLL/CLGL/TwInputdetailService.cs index 4ac4a4e3..188ec6cf 100644 --- a/SGGL/BLL/CLGL/TwInputdetailService.cs +++ b/SGGL/BLL/CLGL/TwInputdetailService.cs @@ -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, diff --git a/SGGL/BLL/CLGL/TwMaterialstockService.cs b/SGGL/BLL/CLGL/TwMaterialstockService.cs index 6d3bcc3e..ac078e0b 100644 --- a/SGGL/BLL/CLGL/TwMaterialstockService.cs +++ b/SGGL/BLL/CLGL/TwMaterialstockService.cs @@ -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 } } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/CLGL/TwOutputdetailService..cs b/SGGL/BLL/CLGL/TwOutputdetailService..cs index 2c082dd1..bbd6db54 100644 --- a/SGGL/BLL/CLGL/TwOutputdetailService..cs +++ b/SGGL/BLL/CLGL/TwOutputdetailService..cs @@ -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 } } -} \ No newline at end of file +} diff --git a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs index 784ed5f9..f46f48e7 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs @@ -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 listStr = new List(); @@ -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 listStr = new List(); listStr.Add(new SqlParameter("@Projectid", projectid)); listStr.Add(new SqlParameter("@PipeArea", BLL.PipelineService.PipeArea_SHOP)); diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx index ef42c711..3e1f0ab4 100644 --- a/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx +++ b/SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx @@ -61,8 +61,17 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index 69886fb7..27081c7f 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx @@ -158,8 +158,11 @@ - + + + diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx index 87d0941c..8a8f7a58 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx @@ -66,6 +66,9 @@ + + + + + + + + @@ -179,8 +188,17 @@ FieldType="String" HeaderText="入库单编号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx index ec77b46a..ecc6a8e7 100644 --- a/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx +++ b/SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx @@ -65,8 +65,17 @@ FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx index 3fc1bf06..6e34cb4e 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx @@ -178,8 +178,17 @@ + + + + + + @@ -211,10 +220,22 @@ FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center" TextAlign="Left"> - + + + + + + @@ -262,10 +283,22 @@ FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center" TextAlign="Left"> - + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx index 1df44192..f3b0c768 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx @@ -81,8 +81,17 @@ FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + @@ -118,8 +127,17 @@ FieldType="String" HeaderText="管线号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx index e066e76b..75914890 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx @@ -61,8 +61,17 @@ FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx index fee957db..0d2499e0 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx @@ -87,8 +87,17 @@ + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs index af52b468..a8e0e2b4 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs @@ -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 } -} \ No newline at end of file +} diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx index 68676741..2bdd6a00 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx @@ -64,8 +64,17 @@ FieldType="String" HeaderText="仓库编码" TextAlign="Left" HeaderTextAlign="Center"> + + + + + + diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx index bc301bee..8640e859 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx @@ -177,8 +177,17 @@ FieldType="String" HeaderText="预制组件号" TextAlign="Left" HeaderTextAlign="Center"> --%> + + + + + + diff --git a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx index d18c601f..4b64d246 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -84,7 +84,7 @@ namespace FastReport } - + @@ -137,7 +137,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx index 053453af..ff4b0ce8 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx @@ -119,9 +119,21 @@ FieldType="String" HeaderText="预制组件" HeaderTextAlign="Center" TextAlign="Left"> - + TextAlign="Left" Width="150px"> + + + + + + - + + + + + + @@ -211,10 +235,22 @@ - + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs index ff4ba3b1..36f6deb8 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs @@ -320,7 +320,7 @@ namespace FineUIPro.Web.HJGL.DataImport /// 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 diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx index f0010b3a..a5e57063 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialStock.aspx @@ -34,9 +34,21 @@ + + + + + + diff --git a/SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs b/SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs index 697f8620..2ba8370e 100644 --- a/SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs +++ b/SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs @@ -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; } diff --git a/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs b/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs index ee7545c5..838cefec 100644 --- a/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs +++ b/SGGL/Model/CLGL/Tw_InOutDetailOutput.cs @@ -17,6 +17,10 @@ namespace Model /// public string HeatNo { get; set; } /// + /// 材料编码 + /// + public string Code { get; set; } + /// /// 材料名称 /// public string MaterialName { get; set; } diff --git a/SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs b/SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs index e1477f3b..c432dfac 100644 --- a/SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs +++ b/SGGL/Model/CLGL/Tw_InputDetailBarCodeOutput.cs @@ -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; } diff --git a/SGGL/Model/CLGL/Tw_MaterialStockOutput.cs b/SGGL/Model/CLGL/Tw_MaterialStockOutput.cs index 85daa9d9..49b83c4b 100644 --- a/SGGL/Model/CLGL/Tw_MaterialStockOutput.cs +++ b/SGGL/Model/CLGL/Tw_MaterialStockOutput.cs @@ -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; } } -} \ No newline at end of file +} diff --git a/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs b/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs index 72534643..eb058fda 100644 --- a/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs +++ b/SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs @@ -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; } diff --git a/SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs b/SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs index 488a19c7..92f82e61 100644 --- a/SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs +++ b/SGGL/Model/HJGL/PreDesign/Material/MaterialStockItem.cs @@ -9,10 +9,22 @@ namespace Model public class MaterialStockItem { /// - /// 材料编码 + /// 材料主编码 /// 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; }