From 696b0decc0c5140417608e4af12ba7ec16dfa877 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 28 May 2025 16:44:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=B4=A8=E9=87=8F01=5F09=E5=AE=9E=E4=BD=93=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/01_09/Class1.cs | 12 + .../Dtos/10_17/Class1.cs | 12 + .../TaskManager.Contracts.csproj | 5 - .../Entitys/01_09/SupplierProCps.cs | 6 +- .../Entitys/01_09/SupplierProData.cs | 234 ++++++++++++++++++ .../01_09/SupplierProFirstPassyield.cs | 124 ++++++++++ .../01_09/SupplierProStationFirstPassyield.cs | 134 ++++++++++ .../TaskManager.Entity.csproj | 4 - 8 files changed, 519 insertions(+), 12 deletions(-) create mode 100644 API/TaskManager.Contracts/Dtos/01_09/Class1.cs create mode 100644 API/TaskManager.Contracts/Dtos/10_17/Class1.cs create mode 100644 API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs create mode 100644 API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs create mode 100644 API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs diff --git a/API/TaskManager.Contracts/Dtos/01_09/Class1.cs b/API/TaskManager.Contracts/Dtos/01_09/Class1.cs new file mode 100644 index 0000000..6caa457 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/Class1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TaskManager.Contracts.Dtos._01_09 +{ + internal class Class1 + { + } +} diff --git a/API/TaskManager.Contracts/Dtos/10_17/Class1.cs b/API/TaskManager.Contracts/Dtos/10_17/Class1.cs new file mode 100644 index 0000000..c8dfe71 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/10_17/Class1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TaskManager.Contracts.Dtos._10_17 +{ + internal class Class1 + { + } +} diff --git a/API/TaskManager.Contracts/TaskManager.Contracts.csproj b/API/TaskManager.Contracts/TaskManager.Contracts.csproj index 64f3785..3b5b170 100644 --- a/API/TaskManager.Contracts/TaskManager.Contracts.csproj +++ b/API/TaskManager.Contracts/TaskManager.Contracts.csproj @@ -10,9 +10,4 @@ - - - - - diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs b/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs index 50578f4..dc08229 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs @@ -174,17 +174,17 @@ namespace TaskManager.Entity /// /// CC项 , 是传Y，否传N /// - public string Cc { get; set; } + public bool Cc { get; set; } /// /// SC项 , 是传Y，否传N /// - public string Sc { get; set; } + public bool Sc { get; set; } /// /// SPC , 是传Y，否传N /// - public string Spc { get; set; } + public bool Spc { get; set; } /// /// 控制项标准值 diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs b/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs new file mode 100644 index 0000000..e3a99da --- /dev/null +++ b/API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs @@ -0,0 +1,234 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TaskManager.Entity +{ + /// + /// 生产过程数据 + /// + public class SupplierProData + { + /// + /// 供应商代码 + /// + 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 DateTime MaterialInputTime { get; set; } + + /// + /// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public DateTime 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 DateTime CollectTime { get; set; } + + /// + /// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss) + /// + public DateTime 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.Entity/Entitys/01_09/SupplierProFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs new file mode 100644 index 0000000..b933eb3 --- /dev/null +++ b/API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TaskManager.Entity +{ + /// + /// 产品一次合格率 + /// + public class SupplierProFirstPassyield + { + /// + /// 供应商代码 + /// + 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 DateTime StatisticalTime { get; set; } + + /// + /// 值统计时间，格式(yyyy-MM-dd HH:mm:ss) + /// + public DateTime DateTime { get; set; } + } +} diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs new file mode 100644 index 0000000..88e10a0 --- /dev/null +++ b/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs @@ -0,0 +1,134 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TaskManager.Entity.Entitys._01_09 +{ + /// + /// 工位一次合格率 + /// + public class SupplierProStationFirstPassyield + { + /// + /// 供应商代码 + /// + 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-dd HH:mm:ss + /// + public DateTime StatisticalTime { get; set; } + + /// + /// 值统计时间，格式：yyyy-MM-dd HH:mm:ss + /// + public DateTime 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 @@ - - - - From eebc64e497ceed55175f5db9571bca110ad7a69b Mon Sep 17 00:00:00 2001 From: me Date: Wed, 28 May 2025 16:52:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AE=9E=E4=BD=931?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20250526065431_Init.Designer.cs | 1 + .../Migrations/JobDbContextModelSnapshot.cs | 1 + API/TaskManager.Entity/Entity.cs | 6 +- .../Entitys/10_17/Class1.cs | 12 -- .../SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs | 111 ++++++++++++++++++ .../TaskManager.Entity.csproj | 4 - .../JobDbContext.cs | 68 ++++++++++- .../TaskManager.EntityFramework.csproj | 8 ++ 8 files changed, 190 insertions(+), 21 deletions(-) delete mode 100644 API/TaskManager.Entity/Entitys/10_17/Class1.cs create mode 100644 API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs 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 + From f8d9011273345e0a41a790f258319c1f6b338901 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Wed, 28 May 2025 16:53:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entitys/01_09/SupplierProStationFirstPassyield.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs b/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs index 88e10a0..7ef6ba0 100644 --- a/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs +++ b/API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace TaskManager.Entity.Entitys._01_09 +namespace TaskManager.Entity { /// /// 工位一次合格率