赵新宇 3 weeks ago
parent
commit
d9ac787ae1
  1. 1
      API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs
  2. 1
      API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs
  3. 2
      API/TaskManager.Contracts/Dtos/01_09/Class1.cs
  4. 12
      API/TaskManager.Contracts/Dtos/10_17/Class1.cs
  5. 5
      API/TaskManager.Contracts/TaskManager.Contracts.csproj
  6. 6
      API/TaskManager.Entity/Entity.cs
  7. 6
      API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs
  8. 234
      API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs
  9. 124
      API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs
  10. 134
      API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs
  11. 111
      API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs
  12. 4
      API/TaskManager.Entity/TaskManager.Entity.csproj
  13. 68
      API/TaskManager.EntityFramework/JobDbContext.cs
  14. 8
      API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj

1
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

1
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

2
API/TaskManager.Entity/Entitys/10_17/Class1.cs → API/TaskManager.Contracts/Dtos/01_09/Class1.cs

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TaskManager.Entity.Entitys._10_17
namespace TaskManager.Contracts.Dtos._01_09
{
internal class Class1
{

12
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
{
}
}

5
API/TaskManager.Contracts/TaskManager.Contracts.csproj

@ -10,9 +10,4 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<Folder Include="Dtos\01_09\" />
<Folder Include="Dtos\10_17\" />
</ItemGroup>
</Project>

6
API/TaskManager.Entity/Entity.cs

@ -137,9 +137,9 @@ namespace TaskManager.Entity
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
{
}
//public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
//{
//}
/// <summary>
/// 缺陷业务数据

6
API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs

@ -174,17 +174,17 @@ namespace TaskManager.Entity
/// <summary>
/// CC项 , 是传Y,否传N
/// </summary>
public string Cc { get; set; }
public bool Cc { get; set; }
/// <summary>
/// SC项 , 是传Y,否传N
/// </summary>
public string Sc { get; set; }
public bool Sc { get; set; }
/// <summary>
/// SPC , 是传Y,否传N
/// </summary>
public string Spc { get; set; }
public bool Spc { get; set; }
/// <summary>
/// 控制项标准值

234
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
{
/// <summary>
/// 生产过程数据
/// </summary>
public class SupplierProData
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 工位人员编号
/// </summary>
public string EmpCode { get; set; }
/// <summary>
/// 工位人员姓名
/// </summary>
public string EmpName { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成批次号
/// </summary>
public string VendorProductBatch { get; set; }
/// <summary>
/// 供应商总成SN码
/// </summary>
public string VendorProductSn { get; set; }
/// <summary>
/// 子件编码
/// </summary>
public string SubProdNo { get; set; }
/// <summary>
/// 子件名称
/// </summary>
public string SubProdName { get; set; }
/// <summary>
/// 子件批次号
/// </summary>
public string SubBatchNo { get; set; }
/// <summary>
/// 子件分包号
/// </summary>
public string ChildPackageInfo { get; set; }
/// <summary>
/// 子件扣料数量
/// </summary>
public decimal SubProdNum { get; set; }
/// <summary>
/// 子件SN码
/// </summary>
public string SubProdSn { get; set; }
/// <summary>
/// 子件物料来源
/// </summary>
public string ChildSource { get; set; }
/// <summary>
/// 分供方代码
/// </summary>
public string SubSupplierCode { get; set; }
/// <summary>
/// 分供方名称(原注释“分分供方”可能为笔误,此处按“分供方”处理)
/// </summary>
public string SubSupplierName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 奇瑞SN码
/// </summary>
public string CheryProductSn { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 班次(白班,晚班,中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime MaterialInputTime { get; set; }
/// <summary>
/// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime MaterialOutputTime { get; set; }
/// <summary>
/// 装配设备编号(原注释“vendorFieldNum”可能为“设备编号”,此处按业务逻辑命名)
/// </summary>
public string VendorFieldNum { get; set; }
/// <summary>
/// 装配设备名称
/// </summary>
public string VendorFieldName { get; set; }
/// <summary>
/// 设备判定的质量状态(合格与否,NG不合适 OK合适)
/// </summary>
public string InstrumentQualityStatus { get; set; }
/// <summary>
/// 人工判定的质量状态(合格与否,NG不合适 OK合适)
/// </summary>
public string ManualQualityStatus { get; set; }
/// <summary>
/// 最终质量状态(合格与否,NG不合适 OK合适)
/// </summary>
public string FinalQualityStatus { get; set; }
/// <summary>
/// 采集时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime CollectTime { get; set; }
/// <summary>
/// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DateTime { get; set; }
/// <summary>
/// 父件硬件版本号
/// </summary>
public string ParentHardwareRevision { get; set; }
/// <summary>
/// 父件软件版本号
/// </summary>
public string ParentSoftwareRevision { get; set; }
/// <summary>
/// 子件硬件版本号
/// </summary>
public string ChildHardwareRevision { get; set; }
/// <summary>
/// 子件软件版本号
/// </summary>
public string ChildSoftwareRevision { get; set; }
}
}

124
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
{
/// <summary>
/// 产品一次合格率
/// </summary>
public class SupplierProFirstPassyield
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 生产工单号
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 批次计划数量:每个批次号对应的计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数:当班次合格数汇总
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次(白班,晚班,中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式(yyyy-MM-dd HH:mm:ss)
/// </summary>
public DateTime DateTime { get; set; }
}
}

134
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
{
/// <summary>
/// 工位一次合格率
/// </summary>
public class SupplierProStationFirstPassyield
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 生产工单号(跟排产工单号关联)
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值(使用小数表示,如 0.9601 表示 96.01%,整数位最多10位,小数位最多3位)
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值(使用小数表示,如 0.96 表示 96.00%,整数位最多10位,小数位最多3位)
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次(白班,晚班,中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期,格式:yyyy-MM-dd HH:mm:ss
/// </summary>
public DateTime StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式:yyyy-MM-dd HH:mm:ss
/// </summary>
public DateTime DateTime { get; set; }
}
}

111
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
{
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
{
/// <summary>
/// 供应商代码
/// </summary>
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
public string SupplierName { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
public string PlantName { get; set; }
/// <summary>
/// 车间代码
/// </summary>
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称
/// </summary>
public string WorkshopName { get; set; }
/// <summary>
/// 产线代码
/// </summary>
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
public string ProductionLineName { get; set; }
/// <summary>
/// 工位代码
/// </summary>
public string StationId { get; set; }
/// <summary>
/// 工位名称
/// </summary>
public string StationName { get; set; }
/// <summary>
/// 奇瑞零件号
/// </summary>
public string CheryProductNo { get; set; }
/// <summary>
/// 奇瑞零件名称
/// </summary>
public string CheryProductName { get; set; }
/// <summary>
/// 供应商总成零件号
/// </summary>
public string VendorProductNo { get; set; }
/// <summary>
/// 供应商总成零件名称
/// </summary>
public string VendorProductName { get; set; }
/// <summary>
/// 生产批次号
/// </summary>
public string ProductBatchNo { get; set; }
/// <summary>
/// 生产工单号,(跟排产工单号关联)
/// </summary>
public string ManufactureNo { get; set; }
/// <summary>
/// 批次计划数量
/// </summary>
public decimal WorkOrderNumber { get; set; }
/// <summary>
/// 不合格数
/// </summary>
public decimal DefectiveNumber { get; set; }
/// <summary>
/// 合格数
/// </summary>
public decimal AcceptableNumber { get; set; }
/// <summary>
/// 一次合格率实际值,使用小数表示,如0.9601表示合格率为96.01%整数位最多10位,小数位最多3位
/// </summary>
public decimal OncePassRateRealValue { get; set; }
/// <summary>
/// 一次合格率目标值,使用小数表示,如0.96表示合格率目标为96.00%。整数位最多10位,小数位最多3位
/// </summary>
public decimal OncePassRateTagValue { get; set; }
/// <summary>
/// 班次,班次如何区分需备注(白班,晚班,中班)
/// </summary>
public string WorkShift { get; set; }
/// <summary>
/// 生产日期,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string StatisticalTime { get; set; }
/// <summary>
/// 值统计时间,格式(yyyy-MM-ddHH:mm:ss)
/// </summary>
public string DateTime { get; set; }
}
}

4
API/TaskManager.Entity/TaskManager.Entity.csproj

@ -10,8 +10,4 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<Folder Include="Entitys\10_17\" />
</ItemGroup>
</Project>

68
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<SUPPLIER_PRO_STATION_FIRST_PASSYIELD>(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);
});
}
}
}

8
API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj

@ -8,7 +8,15 @@
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save