1

SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class Tw_ArrivalStatisticsOutPut
+    {
+        public string MaterialCode { get; set; }
+        public string MaterialName { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
+        public string MaterialDef { get; set; }
+        public decimal NeedNum { get; set; }
+        public decimal RealNum { get; set; }
+        public decimal MatchRate { get; set; }
+        public string MatchRateString { get; set; }
+    }
+}

SGGL/Model/CLGL/Tw_InOutDetailOutput.cs

@@ -8,8 +8,18 @@ namespace Model
 {
     public  class Tw_InOutDetailOutput:Model.Tw_InOutPlanDetail
     {
-        public string PipelineComponentCode { get; set; } //预制组件代码
-        public string MaterialName { get; set; } //预制组件代码
+        /// <summary>
+        /// 预制组件代码
+        /// </summary>
+        public string PipelineComponentCode { get; set; } 
+        /// <summary>
+        /// 材料名称
+        /// </summary>
+        public string MaterialName { get; set; }  
+        /// <summary>
+        /// 材料描述
+        /// </summary>
+        public string MaterialDef { get; set; }  
         public string InputMasterId { get; set; } 
         public string OutputMasterId { get; set; }
         /// <summary>

SGGL/Model/CLGL/Tw_InputDataIn.cs

@@ -7,18 +7,18 @@ namespace Model
         /// <summary>
         /// 申请单编号
         /// </summary>
-        [ExcelColumnIndex("A")] public string CusBillCode { get; set; }
+        public string CusBillCode { get; set; }
         /// <summary>
         /// 仓库
         /// </summary>
-        [ExcelColumnIndex("B")] public string WarehouseCode { get; set; }
+        [ExcelColumnIndex("A")] public string WarehouseCode { get; set; }
         /// <summary>
         /// 材料编码
         /// </summary>
-        [ExcelColumnIndex("C")] public string MaterialCode { get; set; }
+        [ExcelColumnIndex("B")] public string MaterialCode { get; set; }
         /// <summary>
         /// 数量
         /// </summary>
-        [ExcelColumnIndex("D")] public string PlanNum { get; set; }
+        [ExcelColumnIndex("C")] public string PlanNum { get; set; }
     }
 }

SGGL/Model/CLGL/Tw_MaterialStockOutput.cs

@@ -3,6 +3,7 @@
     public class Tw_MaterialStockOutput: Tw_MaterialStock
     {
         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

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class Tw_PipeMatMatchOutput
+    {
+        public string Id { get; set; }
+        public string PipelineId { get; set; }
+        public string PipelineCode { get; set; }
+        public string PrefabricatedComponents { get; set; }
+        public string MaterialCode { get; set; }
+        public string MaterialName { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
+        public string MaterialDef { get; set; }
+        public decimal? NeedNum { get; set; }
+        public decimal? MatchNum { get; set; }
+        public decimal? MatchRate { get; set; }
+        public string MatchRateString { get; set; }
+    }
+}

SGGL/Model/CLGL/Tw_PrintModel.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class Tw_PrintMaster
+    {
+        public string BillName { get; set; }
+        public string ReqUnitName { get; set; }
+        public string AuditManName { get; set; }
+        public string CreateManName { get; set; }
+        public string AuditDate { get; set; }
+        public string CreateDate { get; set; }
+        public string CusBillCode { get; set; }
+        public string ProjectName { get; set; }
+        public string CategoryString { get; set; }
+        public string WarehouseManName { get; set; }
+        public string WarehouseManAuditDate { get; set; }
+    }
+    public class Tw_PrintDetail
+    {
+        public int SortIndex { get; set; }
+        public string PipelineCode { get; set; }
+        public string PipelineComponentCode { get; set; }
+        public string MaterialCode { get; set; }
+        public string MaterialDef { get; set; }
+        public string MaterialSpec { get; set; }
+        public string MaterialUnit { get; set; }
+        public string PlanNum { get; set; }
+        public string ActNum { get; set; }
+        public string UnitWorkName { get; set; } 
+    }
+}