diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs new file mode 100644 index 0000000..2198333 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// BOM主数据 + /// + public class SUPPLIER_BOM_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// BOM编码 + /// + public string BomCode { get; set; } + + /// + /// BOM名称 + /// + public string BomName { get; set; } + + /// + /// BOM版本 + /// + public string BomVersion { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 供应商父件编码 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商父件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 父件类型(成品, 半成品) + /// + public string VendorProductType { get; set; } + + /// + /// 父件单位 + /// + public string MaterialUnit { get; set; } + + /// + /// 子件编码 + /// + public string SubMaterialCode { get; set; } + + /// + /// 子件名称 + /// + public string SubMaterialName { get; set; } + + /// + /// 子件类型(半成品, 原材料) + /// + public string SubMaterialType { get; set; } + + /// + /// 子件单位 + /// + public string SubMaterialUnit { get; set; } + + /// + /// 子件用量 + /// + public decimal SubMaterialQuota { get; set; } + + /// + /// BOM变更时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string DataUpdateTime { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs new file mode 100644 index 0000000..54be819 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 人员资质信息 + /// + public class SUPPLIER_EMPLOYEE_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 工位代码 + /// + public string StationId { get; set; } + + /// + /// 工位名称 + /// + public string StationName { get; set; } + + /// + /// 工位人员账号 + /// + public string OperatorId { get; set; } + + /// + /// 工位人员姓名 + /// + public string OperatorName { get; set; } + + /// + /// 是否有资质(Y,N) + /// + public bool HaveQuantity { get; set; } + + /// + /// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string DataUpdateTime { get; set; } + + /// + /// 岗位代码 + /// + public string PositionId { get; set; } + + /// + /// 岗位名称 + /// + public string PositionName { get; set; } + + /// + /// 资质等级(Level_4，Level_3，Level_2, Level_1) + /// + public string QualificationLevel { get; set; } + + /// + /// 资质获取时间 + /// + public string CheckInTime { get; set; } + + /// + /// 资质失去时间 + /// + public string CheckOutTime { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs new file mode 100644 index 0000000..bffe9eb --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 供应商基础信息 + /// + public class SUPPLIER_INFO_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 工位代码 + /// + public string StationId { get; set; } + + /// + /// 工位名称 + /// + public string StationName { get; set; } + + /// + /// 是否关键工位（Y/N） + /// + public bool KeyStation { get; set; } + + /// + /// 供应商修改时间，格式(yyyy-MM-dd HH:mm:ss) + /// + public string DataUpdateTime { get; set; } + + /// + /// 产线顺序 + /// + public int ProductionLineOrder { get; set; } + + /// + /// 工位顺序 + /// + public int StationOrder { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs new file mode 100644 index 0000000..7260019 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs @@ -0,0 +1,255 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 过程控制项质量数据 + /// + public class SUPPLIER_PRO_CPS_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 供应商总成SN码 + /// + public string VendorProductSn { get; set; } + + /// + /// 供应商总成批次号 + /// + public string VendorProductBatch { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 奇瑞SN码 + /// + public string CheryProductSn { get; set; } + + /// + /// 生产批次号 + /// + public string ProductBatchNo { get; set; } + + /// + /// 生产工单号 + /// + public string ManufactureNo { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 工位代码 + /// + public string StationId { get; set; } + + /// + /// 工位名称 + /// + public string StationName { get; set; } + + /// + /// 工位人员编号 + /// + public string EmpCode { get; set; } + + /// + /// 工位人员姓名 + /// + public string EmpName { get; set; } + + /// + /// 控制项名称 + /// + public string VendorFieldName { get; set; } + + /// + /// 控制项代码 + /// + public string VendorFieldCode { get; set; } + + /// + /// 控制项点位 + /// + public string GatherSpot { get; set; } + + /// + /// 控制项要求频率 + /// + public decimal SamplingRate { get; set; } + + /// + /// 上下限更新时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string LimitUpdateTime { get; set; } + + /// + /// 控制项描述 + /// + public string VendorFieldDesc { get; set; } + + /// + /// 载体编码 + /// + public string CarrierCode { get; set; } + + /// + /// 投入数量 + /// + public decimal IntputQty { get; set; } + + /// + /// 一次合格数量 + /// + public decimal FttQty { get; set; } + + /// + /// 参数 , 是传Y，否传N + /// + public string Parameter { get; set; } + + /// + /// 特性 , 是传Y，否传N + /// + public string Characteristic { get; set; } + + /// + /// CC项 , 是传Y，否传N + /// + public bool Cc { get; set; } + + /// + /// SC项 , 是传Y，否传N + /// + public bool Sc { get; set; } + + /// + /// SPC , 是传Y，否传N + /// + public bool Spc { get; set; } + + /// + /// 控制项标准值 + /// + public string StandardValue { get; set; } + + /// + /// 控制项上限 + /// + public decimal UpperLimit { get; set; } + + /// + /// 控制项下限 + /// + public decimal LowerLimit { get; set; } + + /// + /// 控制项实测值 + /// + public decimal DecimalValue { get; set; } + + /// + /// 控制项值的单位名称-中文 + /// + public string UnitCn { get; set; } + + /// + /// 控制项单位英文 + /// + public string UnitEn { get; set; } + + /// + /// 检测结果 + /// + public string CheckResult { get; set; } + + /// + /// 在线检测(inline,offline,both) + /// + public string DetectionMode { get; set; } + + /// + /// 班次(白班，晚班，中班) + /// + public string WorkShift { get; set; } + + /// + /// 采集时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string CollectTime { get; set; } + + /// + /// 检测方式(人工,设备) + /// + public string CheckMode { get; set; } + + /// + /// 检测设备编号 + /// + public string DeviceCode { get; set; } + + /// + /// 检测设备名称 + /// + public string DeviceName { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs new file mode 100644 index 0000000..408bdda --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs @@ -0,0 +1,235 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 生产过程数据 + /// + public class SUPPLIER_PRO_DATA_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 工位代码 + /// + public string StationId { get; set; } + + /// + /// 工位名称 + /// + public string StationName { get; set; } + + /// + /// 工位人员编号 + /// + public string EmpCode { get; set; } + + /// + /// 工位人员姓名 + /// + public string EmpName { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成批次号 + /// + public string VendorProductBatch { get; set; } + + /// + /// 供应商总成SN码 + /// + public string VendorProductSn { get; set; } + + /// + /// 子件编码 + /// + public string SubProdNo { get; set; } + + /// + /// 子件名称 + /// + public string SubProdName { get; set; } + + /// + /// 子件批次号 + /// + public string SubBatchNo { get; set; } + + /// + /// 子件分包号 + /// + public string ChildPackageInfo { get; set; } + + /// + /// 子件扣料数量 + /// + public decimal SubProdNum { get; set; } + + /// + /// 子件SN码 + /// + public string SubProdSn { get; set; } + + /// + /// 子件物料来源 + /// + public string ChildSource { get; set; } + + /// + /// 分供方代码 + /// + public string SubSupplierCode { get; set; } + + /// + /// 分供方名称（原注释“分分供方”可能为笔误，此处按“分供方”处理） + /// + public string SubSupplierName { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 奇瑞SN码 + /// + public string CheryProductSn { get; set; } + + /// + /// 生产工单号 + /// + public string ManufactureNo { get; set; } + + /// + /// 生产批次号 + /// + public string ProductBatchNo { get; set; } + + /// + /// 班次(白班，晚班，中班) + /// + public string WorkShift { get; set; } + + /// + /// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string MaterialInputTime { get; set; } + + /// + /// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string MaterialOutputTime { get; set; } + + /// + /// 装配设备编号（原注释“vendorFieldNum”可能为“设备编号”，此处按业务逻辑命名） + /// + public string VendorFieldNum { get; set; } + + /// + /// 装配设备名称 + /// + public string VendorFieldName { get; set; } + + /// + /// 设备判定的质量状态（合格与否，NG不合适 OK合适） + /// + public string InstrumentQualityStatus { get; set; } + + /// + /// 人工判定的质量状态（合格与否，NG不合适 OK合适） + /// + public string ManualQualityStatus { get; set; } + + /// + /// 最终质量状态（合格与否，NG不合适 OK合适） + /// + public string FinalQualityStatus { get; set; } + + /// + /// 采集时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string CollectTime { get; set; } + + /// + /// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public string DateTime { get; set; } + + /// + /// 父件硬件版本号 + /// + public string ParentHardwareRevision { get; set; } + + /// + /// 父件软件版本号 + /// + public string ParentSoftwareRevision { get; set; } + + /// + /// 子件硬件版本号 + /// + public string ChildHardwareRevision { get; set; } + + /// + /// 子件软件版本号 + /// + public string ChildSoftwareRevision { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs new file mode 100644 index 0000000..fa81c39 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 产品一次合格率 + /// + public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 生产工单号 + /// + public string ManufactureNo { get; set; } + + /// + /// 生产批次号 + /// + public string ProductBatchNo { get; set; } + + /// + /// 批次计划数量：每个批次号对应的计划数量 + /// + public decimal WorkOrderNumber { get; set; } + + /// + /// 不合格数 + /// + public decimal DefectiveNumber { get; set; } + + /// + /// 合格数：当班次合格数汇总 + /// + public decimal AcceptableNumber { get; set; } + + /// + /// 一次合格率实际值 + /// + public decimal OncePassRateRealValue { get; set; } + + /// + /// 一次合格率目标值 + /// + public decimal OncePassRateTagValue { get; set; } + + /// + /// 班次（白班，晚班，中班） + /// + public string WorkShift { get; set; } + + /// + /// 生产日期，格式(yyyy-MM-dd HH:mm:ss) + /// + public string StatisticalTime { get; set; } + + /// + /// 值统计时间，格式(yyyy-MM-dd HH:mm:ss) + /// + public string DateTime { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/Dtos.cs b/API/TaskManager.Contracts/Dtos/Dtos.cs index 142c353..e26e00f 100644 --- a/API/TaskManager.Contracts/Dtos/Dtos.cs +++ b/API/TaskManager.Contracts/Dtos/Dtos.cs @@ -1,4 +1,6 @@ using Newtonsoft.Json; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; @@ -74,7 +76,20 @@ namespace TaskManager.Contracts.Dtos } + public class BaseEntityDto + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public long UId { get; set; } + public bool WriteState { get; set; } + public bool ReadState { get; set; } + + public DateTime CreationTime { get; set; } + public string Remark { get; set; } + + public Guid TaskId { get; set; } + } public class CherryReadBaseEntityDto { diff --git a/API/TaskManager.Contracts/Dtos/01_09/Class1.cs b/API/TaskManager.Entity/Entitys/10_17/Class1.cs similarity index 78% rename from API/TaskManager.Contracts/Dtos/01_09/Class1.cs rename to API/TaskManager.Entity/Entitys/10_17/Class1.cs index 6caa457..7128337 100644 --- a/API/TaskManager.Contracts/Dtos/01_09/Class1.cs +++ b/API/TaskManager.Entity/Entitys/10_17/Class1.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace TaskManager.Contracts.Dtos._01_09 +namespace TaskManager.Entity.Entitys._10_17 { internal class Class1 { diff --git a/API/TaskManager.Entity/TaskManager.Entity.csproj b/API/TaskManager.Entity/TaskManager.Entity.csproj index b11c8a0..3b5b170 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -10,8 +10,4 @@ - - - -