diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 35d6bce..ab9ba3a 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -74,72 +74,7 @@ namespace TaskManager.Entity } - - - - - /// - /// 来料检验数据 - /// - public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity - { - } - - /// - /// 排产数据 - /// - public class SUPPLIER_PRO_SCHEDULING : BaseEntity - { - } - - /// - /// 供应商基础信息 - /// - public class SUPPLIER_INFO : BaseEntity - { - } - - /// - /// 人员资质信息 - /// - public class SUPPLIER_EMPLOYEE : BaseEntity - { - } - - /// - /// BOM主数据 - /// - public class SUPPLIER_BOM : BaseEntity - { - } - - /// - /// 过程控制项质量数据 - /// - public class SUPPLIER_PRO_CPS : BaseEntity - { - } - - /// - /// 生产过程数据 - /// - public class SUPPLIER_PRO_DATA : BaseEntity - { - } - - /// - /// 产品一次合格率 - /// - public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity - { - } - - /// - /// 工位一次合格率 - /// - //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - //{ - //} + /// /// 缺陷业务数据 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs similarity index 96% rename from API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs index 3900019..863570c 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierBom.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// BOM主数据 /// - public class SupplierBom + public class SUPPLIER_BOM : BaseEntity { /// /// 供应商代码 @@ -94,6 +94,6 @@ namespace TaskManager.Entity /// /// BOM变更时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs similarity index 92% rename from API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs index c38cbe1..9bfa531 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierEmployee.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 人员资质信息 /// - public class SupplierEmployee + public class SUPPLIER_EMPLOYEE : BaseEntity { /// /// 供应商代码 @@ -79,7 +79,7 @@ namespace TaskManager.Entity /// /// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } /// /// 岗位代码 @@ -99,11 +99,11 @@ namespace TaskManager.Entity /// /// 资质获取时间 /// - public DateTime CheckInTime { get; set; } + public string CheckInTime { get; set; } /// /// 资质失去时间 /// - public DateTime CheckOutTime { get; set; } + public string CheckOutTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs similarity index 96% rename from API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs index a466fe8..934d7e5 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierInfo.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 供应商基础信息 /// - public class SupplierInfo + public class SUPPLIER_INFO : BaseEntity { /// /// 供应商代码 @@ -69,7 +69,7 @@ namespace TaskManager.Entity /// /// 供应商修改时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DataUpdateTime { get; set; } + public string DataUpdateTime { get; set; } /// /// 产线顺序 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs similarity index 99% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs index dc08229..498a756 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 过程控制项质量数据 /// - public class SupplierProCps + public class SUPPLIER_PRO_CPS : BaseEntity { /// /// 供应商代码 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs similarity index 96% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs index e3a99da..2ff8273 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 生产过程数据 /// - public class SupplierProData + public class SUPPLIER_PRO_DATA : BaseEntity { /// /// 供应商代码 @@ -169,12 +169,12 @@ namespace TaskManager.Entity /// /// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime MaterialInputTime { get; set; } + public string MaterialInputTime { get; set; } /// /// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime MaterialOutputTime { get; set; } + public string MaterialOutputTime { get; set; } /// /// 装配设备编号(原注释“vendorFieldNum”可能为“设备编号”,此处按业务逻辑命名) @@ -204,12 +204,12 @@ namespace TaskManager.Entity /// /// 采集时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime CollectTime { get; set; } + public string CollectTime { get; set; } /// /// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } /// /// 父件硬件版本号 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs similarity index 95% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs index b933eb3..1293295 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 产品一次合格率 /// - public class SupplierProFirstPassyield + public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity { /// /// 供应商代码 @@ -114,11 +114,11 @@ namespace TaskManager.Entity /// /// 生产日期,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime StatisticalTime { get; set; } + public string StatisticalTime { get; set; } /// /// 值统计时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs similarity index 96% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs index 93cee45..3be651c 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProMaterialStock.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 来料检验数据 /// - public class SupplierProMaterialStock + public class SUPPLIER_PRO_MATERIAL_STOCK : BaseEntity { /// /// 供应商代码 @@ -134,7 +134,7 @@ namespace TaskManager.Entity /// /// 检验时间,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime CheckTime { get; set; } + public string CheckTime { get; set; } /// /// 控制项要求频率 @@ -159,6 +159,6 @@ namespace TaskManager.Entity /// /// 库存有效日期,格式(yyyy-MM-dd HH:mm:ss) /// - public DateTime DeadLine { get; set; } + public string DeadLine { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs similarity index 91% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs index 669d950..ea5efe5 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProScheduling.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 排产数据 /// - public class SupplierProScheduling + public class SUPPLIER_PRO_SCHEDULING : BaseEntity { /// /// 供应商代码 @@ -89,21 +89,21 @@ namespace TaskManager.Entity /// /// 计划开始时间(格式:yyyy-MM-dd HH:mm:ss) /// - public DateTime PlanBeginTime { get; set; } + public string PlanBeginTime { get; set; } /// /// 计划结束时间(格式:yyyy-MM-dd HH:mm:ss) /// - public DateTime PlanEndTime { get; set; } + public string PlanEndTime { get; set; } /// /// 实际开始时间(格式:yyyy-MM-dd HH:mm:ss) /// - public DateTime ActualBeginTime { get; set; } + public string ActualBeginTime { get; set; } /// /// 实际结束时间(格式:yyyy-MM-dd HH:mm:ss) /// - public DateTime ActualEndTime { get; set; } + public string ActualEndTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs similarity index 95% rename from API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs rename to API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs index 7ef6ba0..29689d6 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs @@ -9,7 +9,7 @@ namespace TaskManager.Entity /// /// 工位一次合格率 /// - public class SupplierProStationFirstPassyield + public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity { /// /// 供应商代码 @@ -124,11 +124,11 @@ namespace TaskManager.Entity /// /// 生产日期,格式:yyyy-MM-dd HH:mm:ss /// - public DateTime StatisticalTime { get; set; } + public string StatisticalTime { get; set; } /// /// 值统计时间,格式:yyyy-MM-dd HH:mm:ss /// - public DateTime DateTime { get; set; } + public string DateTime { get; set; } } } diff --git a/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs b/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs deleted file mode 100644 index 3396024..0000000 --- a/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TaskManager.Entity.Entitys -{ - /// - /// 工位一次合格率 - /// - public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - { - /// - /// 供应商代码 - /// - 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 CheryProductNo { get; set; } - /// - /// 奇瑞零件名称 - /// - public string CheryProductName { get; set; } - /// - /// 供应商总成零件号 - /// - public string VendorProductNo { get; set; } - /// - /// 供应商总成零件名称 - /// - public string VendorProductName { get; set; } - /// - /// 生产批次号 - /// - public string ProductBatchNo { get; set; } - /// - /// 生产工单号,(跟排产工单号关联) - /// - public string ManufactureNo { get; set; } - /// - /// 批次计划数量 - /// - public decimal WorkOrderNumber { get; set; } - /// - /// 不合格数 - /// - public decimal DefectiveNumber { get; set; } - /// - /// 合格数 - /// - public decimal AcceptableNumber { get; set; } - /// - /// 一次合格率实际值,使用小数表示,如0.9601表示合格率为96.01%整数位最多10位,小数位最多3位 - /// - public decimal OncePassRateRealValue { get; set; } - /// - /// 一次合格率目标值,使用小数表示,如0.96表示合格率目标为96.00%。整数位最多10位,小数位最多3位 - /// - public decimal OncePassRateTagValue { get; set; } - /// - /// 班次,班次如何区分需备注(白班,晚班,中班) - /// - public string WorkShift { get; set; } - /// - /// 生产日期,格式(yyyy-MM-ddHH:mm:ss) - /// - public string StatisticalTime { get; set; } - /// - /// 值统计时间,格式(yyyy-MM-ddHH:mm:ss) - /// - public string DateTime { get; set; } - } -} diff --git a/API/TaskManager.Entity/TaskManager.Entity.csproj b/API/TaskManager.Entity/TaskManager.Entity.csproj index 3b5b170..b11c8a0 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -10,4 +10,8 @@ + + + + diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index d3b032a..61ad771 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -11,7 +11,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using TaskManager.Entity; -using TaskManager.Entity.Entitys; using Wood.Util;