diff --git a/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs b/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs index 2f10a63..00b5e39 100644 --- a/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs +++ b/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TaskManager.EntityFramework; #nullable disable diff --git a/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs b/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs index 2a9ab4f..5c1c319 100644 --- a/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs +++ b/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TaskManager.EntityFramework; #nullable disable diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 02c7799..acc3f3c 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -137,9 +137,9 @@ namespace TaskManager.Entity /// /// 工位一次合格率 /// - public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - { - } + //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity + //{ + //} /// /// 缺陷业务数据 diff --git a/API/TaskManager.Entity/Entitys/10_17/Class1.cs b/API/TaskManager.Entity/Entitys/10_17/Class1.cs deleted file mode 100644 index 7128337..0000000 --- a/API/TaskManager.Entity/Entitys/10_17/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TaskManager.Entity.Entitys._10_17 -{ - internal class Class1 - { - } -} 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 new file mode 100644 index 0000000..3396024 --- /dev/null +++ b/API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs @@ -0,0 +1,111 @@ +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 b11c8a0..3b5b170 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -10,8 +10,4 @@ - - - - diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index 42abc5f..4974a4a 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using TaskManager.Entity; +using TaskManager.Entity.Entitys; using Wood.Util; @@ -247,15 +248,78 @@ namespace TaskManager.EntityFramework //}); // 配置表名 - + // 其他配置... + + + + + //工位一次合格率 + modelBuilder.Entity(b => + { + b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD"); + //供应商代码 + b.Property(e => e.SupplierCode).HasColumnType("VARCHAR").HasMaxLength(32); + //供应商名称 + b.Property(e => e.SupplierName).HasColumnType("VARCHAR").HasMaxLength(64); + //工厂代码 + b.Property(e => e.PlantId).HasColumnType("VARCHAR").HasMaxLength(32); + //工厂名称 + b.Property(e => e.PlantName).HasColumnType("VARCHAR").HasMaxLength(64); + //车间代码 + b.Property(e => e.WorkshopId).HasColumnType("VARCHAR").HasMaxLength(32); + //车间名称 + b.Property(e => e.WorkshopName).HasColumnType("VARCHAR").HasMaxLength(64); + //产线代码 + b.Property(e => e.ProductionLineId).HasColumnType("VARCHAR").HasMaxLength(32); + //产线名称 + b.Property(e => e.ProductionLineName).HasColumnType("VARCHAR").HasMaxLength(100); + //工位代码 + b.Property(e => e.StationId).HasColumnType("VARCHAR").HasMaxLength(32); + //工位名称 + b.Property(e => e.StationName).HasColumnType("VARCHAR").HasMaxLength(64); + //奇瑞零件号 + b.Property(e => e.CheryProductNo).HasColumnType("VARCHAR").HasMaxLength(32); + //奇瑞零件名称 + b.Property(e => e.CheryProductName).HasColumnType("VARCHAR").HasMaxLength(100); + //供应商总成零件号 + b.Property(e => e.VendorProductNo).HasColumnType("VARCHAR").HasMaxLength(32); + //供应商总成零件名称 + b.Property(e => e.VendorProductName).HasColumnType("VARCHAR").HasMaxLength(100); + //生产批次号 + b.Property(e => e.ProductBatchNo).HasColumnType("VARCHAR").HasMaxLength(32); + //生产工单号,(跟排产工单号关联) + b.Property(e => e.ManufactureNo).HasColumnType("VARCHAR").HasMaxLength(32); + //批次计划数量 + b.Property(e => e.WorkOrderNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5); + //不合格数 + b.Property(e => e.DefectiveNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5); + //合格数 + b.Property(e => e.AcceptableNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5); + //一次合格率实际值,使用小数表示，如0.9601表示合格率为96.01%整数位最多10位，小数位最多3位 + b.Property(e => e.OncePassRateRealValue).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5); + //一次合格率目标值,使用小数表示，如0.96表示合格率目标为96.00%。整数位最多10位，小数位最多3位 + b.Property(e => e.OncePassRateTagValue).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5); + //班次,班次如何区分需备注(白班，晚班，中班) + b.Property(e => e.WorkShift).HasColumnType("VARCHAR").HasMaxLength(10); + //生产日期,格式(yyyy-MM-ddHH:mm:ss) + b.Property(e => e.StatisticalTime).HasColumnType("CHAR").HasMaxLength(19); + //值统计时间,格式(yyyy-MM-ddHH:mm:ss) + b.Property(e => e.DateTime).HasColumnType("CHAR").HasMaxLength(19); + b.Property(e => e.UId).HasColumnType("bigint").ValueGeneratedOnAdd().IsRequired(); + b.Property(e => e.Remark).HasColumnType("NVarchar").HasMaxLength(500); + b.HasKey(e => e.UId); + + }); + + } - + } } diff --git a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj index 9d3ae29..1710eda 100644 --- a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj +++ b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj @@ -8,7 +8,15 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +