Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/Model/CLGL/Tw_InOutDetailOutput.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class Tw_InOutDetailOutput:Model.Tw_InOutPlanDetail
+    {
+        public string PipelineComponentCode { get; set; } //预制组件代码
+        public string MaterialName { get; set; } //预制组件代码
+        public string InputMasterId { get; set; } 
+        public string OutputMasterId { get; set; }  
+    }
+}

SGGL/Model/CLGL/Tw_InOutMasterOutput.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class Tw_InOutMasterOutput:Model.Tw_InOutPlanMaster
+    {
+        public string InOutPlanMasterId { get; set; } 
+        public string CategoryString { get; set; } 
+        public string StateString { get; set; } 
+        public string TypeString { get; set; } 
+        public string CreateManName { get; set; } 
+        public string ReqUnitName { get; set; }   
+        public string UnitWorkId { get; set; } 
+        public string WeldTaskCode { get; set; } 
+    }
+}

SGGL/Model/CLGL/Tw_InputDataIn.cs

@@ -0,0 +1,24 @@
+using MiniExcelLibs.Attributes;
+
+namespace Model
+{
+    public class Tw_InputDataIn
+    {
+        /// <summary>
+        /// 申请单编号
+        /// </summary>
+        [ExcelColumnIndex("A")] public string CusBillCode { get; set; }
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        [ExcelColumnIndex("B")] public string WarehouseCode { get; set; }
+        /// <summary>
+        /// 材料编码
+        /// </summary>
+        [ExcelColumnIndex("C")] public string MaterialCode { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExcelColumnIndex("D")] public string PlanNum { get; set; }
+    }
+}

SGGL/Model/CLGL/Tw_MaterialStockOutput.cs

@@ -0,0 +1,9 @@
+namespace Model
+{
+    public class Tw_MaterialStockOutput: Tw_MaterialStock
+    {
+        public string MaterialName { get; set; }
+        public string MaterialSpec { get; set; } 
+        public string MaterialUnit { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -180,6 +180,10 @@
     <Compile Include="Chart\DataSourceChart.cs" />
     <Compile Include="Chart\DataSourcePoint.cs" />
     <Compile Include="Chart\DataSourceTeam.cs" />
+    <Compile Include="CLGL\Tw_InOutDetailOutput.cs" />
+    <Compile Include="CLGL\Tw_InOutMasterOutput.cs" />
+    <Compile Include="CLGL\Tw_InputDataIn.cs" />
+    <Compile Include="CLGL\Tw_MaterialStockOutput.cs" />
     <Compile Include="ConstructionLogCQMS.cs" />
     <Compile Include="ConstructionLogHSE.cs" />
     <Compile Include="ConstructionLogMachineItem.cs" />