This commit is contained in:
2024-09-27 18:17:21 +08:00
parent be070f85e2
commit 064a849b97
73 changed files with 3248 additions and 589 deletions
@@ -24,6 +24,7 @@ namespace Model
}
public class PackagingPrepipeItem
{
public string PipelineComponentId { get; set; }
public string PipelineComponentCode { get; set; }
public string PreUnit { get; set; }
public string UnitWorkName { get; set; }
@@ -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; }
}
}
+12 -2
View File
@@ -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>
+4 -4
View File
@@ -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; }
}
}
@@ -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; }
}
+25
View File
@@ -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; }
}
}
+36
View File
@@ -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; }
}
}
+36
View File
@@ -279295,6 +279295,8 @@ namespace Model
private string _WeldingLocationId;
private string _Specification;
private string _IsWelding;
private string _PipelineCode;
@@ -279323,6 +279325,8 @@ namespace Model
private string _PipeArea;
private string _MaterialCode;
private string _WeldJointNum;
public View_HJGL_WeldingTask()
@@ -279649,6 +279653,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Specification", DbType="NVarChar(20)")]
public string Specification
{
get
{
return this._Specification;
}
set
{
if ((this._Specification != value))
{
this._Specification = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsWelding", DbType="VarChar(2) NOT NULL", CanBeNull=false)]
public string IsWelding
{
@@ -279873,6 +279893,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")]
public string MaterialCode
{
get
{
return this._MaterialCode;
}
set
{
if ((this._MaterialCode != value))
{
this._MaterialCode = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointNum", DbType="NVarChar(50)")]
public string WeldJointNum
{
+3
View File
@@ -180,6 +180,9 @@
<Compile Include="Chart\DataSourceChart.cs" />
<Compile Include="Chart\DataSourcePoint.cs" />
<Compile Include="Chart\DataSourceTeam.cs" />
<Compile Include="CLGL\Tw_ArrivalStatisticsOutPut.cs" />
<Compile Include="CLGL\Tw_PipeMatMatchOutput.cs" />
<Compile Include="CLGL\Tw_PrintModel.cs" />
<Compile Include="CLGL\Tw_InOutDetailOutput.cs" />
<Compile Include="CLGL\Tw_InOutMasterOutput.cs" />
<Compile Include="CLGL\Tw_InputDataIn.cs" />