diff --git a/API/CherryTaskManager/appsettings.json b/API/CherryTaskManager/appsettings.json index a5aa839..19fb55a 100644 --- a/API/CherryTaskManager/appsettings.json +++ b/API/CherryTaskManager/appsettings.json @@ -4,7 +4,7 @@ }, "ConnectionStrings": { - "Default": "Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True" + "Default": "Server=192.168.1.228;Database=TaskManager2;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True" }, diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 4885f49..ab9ba3a 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -15,7 +15,7 @@ namespace TaskManager.Entity { Task ExecuteAsync(string url, string path, string takName); } - public class TaskConifgure + public class TaskConifgure:BaseEntity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] @@ -69,7 +69,7 @@ namespace TaskManager.Entity public string RequestDate { get; set; } public string Id { get; set; } - public string TaskId { get; set; } + } diff --git a/API/TaskManager.EntityFramework/JobDbContext.cs b/API/TaskManager.EntityFramework/JobDbContext.cs index 4974a4a..d3b032a 100644 --- a/API/TaskManager.EntityFramework/JobDbContext.cs +++ b/API/TaskManager.EntityFramework/JobDbContext.cs @@ -63,172 +63,172 @@ namespace TaskManager.EntityFramework // // 配置SQL Server连接 // optionsBuilder.UseSqlServer("Server=192.168.1.228;Database=TaskManager;User ID=sa;Password=ChangkeTec@2021;TrustServerCertificate=True"); //} - optionsBuilder.UseSqlServer(GlobalContext.SystemConfig.CustomerDb); + optionsBuilder.UseSqlServer("Server = 192.168.1.228; Database = TaskManager2; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True"); } /// /// 来料检验数据 /// - public DbSet SupplierProMaterialStock { get; set; } + public DbSet SUPPLIER_PRO_MATERIAL_STOCK { get; set; } // 类名与属性名一致 /// /// 排产数据 /// - public DbSet SupplierProScheduling { get; set; } + public DbSet SUPPLIER_PRO_SCHEDULING { get; set; } /// /// 供应商基础信息 /// - public DbSet SupplierInfo { get; set; } + public DbSet SUPPLIER_INFO { get; set; } /// /// 人员资质信息 /// - public DbSet SupplierEmployee { get; set; } + public DbSet SUPPLIER_EMPLOYEE { get; set; } /// /// BOM主数据 /// - public DbSet SupplierBom { get; set; } + public DbSet SUPPLIER_BOM { get; set; } /// /// 过程控制项质量数据 /// - public DbSet SupplierProCps { get; set; } + public DbSet SUPPLIER_PRO_CPS { get; set; } /// /// 生产过程数据 /// - public DbSet SupplierProData { get; set; } + public DbSet SUPPLIER_PRO_DATA { get; set; } /// /// 产品一次合格率 /// - public DbSet SupplierProFirstPassYield { get; set; } + public DbSet SUPPLIER_PRO_FIRST_PASSYIELD { get; set; } /// /// 工位一次合格率 /// - public DbSet SupplierProStationFirstPassYield { get; set; } + public DbSet SUPPLIER_PRO_STATION_FIRST_PASSYIELD { get; set; } /// /// 缺陷业务数据 /// - public DbSet SupplierProFlaw { get; set; } + public DbSet SUPPLIER_PRO_FLAW { get; set; } /// /// 环境业务数据 /// - public DbSet SupplierProEnvironment { get; set; } + public DbSet SUPPLIER_PRO_ENVIRONMENT { get; set; } /// /// 设备OEE达成率 /// - public DbSet SupplierProOeeAchievementRate { get; set; } + public DbSet SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE { get; set; } /// /// OEE时间明细 /// - public DbSet SupplierProOeeTimeDetails { get; set; } + public DbSet SUPPLIER_PRO_OEE_TIME_DETAILS { get; set; } /// /// 物料主数据 /// - public DbSet SupplierProMaterialData { get; set; } + public DbSet SUPPLIER_PRO_MATERIAL_DATA { get; set; } /// /// 附件类数据 /// - public DbSet SupplierProAttachmentData { get; set; } + public DbSet SUPPLIER_PRO_ATTACHMENT_DATA { get; set; } /// /// 工艺装备 /// - public DbSet SupplierProProcessEquipment { get; set; } + public DbSet SUPPLIER_PRO_PROCESS_EQUIPMENT { get; set; } /// /// 工艺 /// - public DbSet SupplierProProcess { get; set; } + public DbSet SUPPLIER_PRO_PROCESS { get; set; } /// /// 整车月度生产计划-2 /// - public DbSet SupplierProPlaning { get; set; } + public DbSet SUPPLIER_PRO_PLANING { get; set; } /// /// M+6月物料需求计划 /// - public DbSet SupplierMrpMonth { get; set; } + public DbSet SUPPLIER_MRP_MONTH { get; set; } /// /// M+6月物料需求计划风险确认 /// - public DbSet SupplierConMmrP { get; set; } + public DbSet SUPPLIER_CON_MMRP { get; set; } /// /// 日物料需求计划 /// - public DbSet SupplierMrpDate { get; set; } + public DbSet SUPPLIER_MRP_DATE { get; set; } /// /// 日物料需求计划风险确认 /// - public DbSet SupplierConDate { get; set; } + public DbSet SUPPLIER_CON_DATE { get; set; } /// /// 计划协议 /// - public DbSet SupplierSaWeek { get; set; } + public DbSet SUPPLIER_SA_WEEK { get; set; } /// /// 采购订单 /// - public DbSet SupplierPo { get; set; } + public DbSet SUPPLIER_PO { get; set; } /// /// 采购订单风险确认 /// - public DbSet SupplierConPo { get; set; } + public DbSet SUPPLIER_CON_PO { get; set; } /// /// 过焊装未过总装 /// - public DbSet SupplierProHSchedul { get; set; } + public DbSet SUPPLIER_PRO_HSCHEDUL { get; set; } /// /// 过涂装未过总装 /// - public DbSet SupplierProTSchedul { get; set; } + public DbSet SUPPLIER_PRO_TSCHEDUL { get; set; } /// /// 排序供货 /// - public DbSet SupplierProCSchedul { get; set; } + public DbSet SUPPLIER_PRO_CSCHEDUL { get; set; } /// /// 看板配送单 /// - public DbSet SupplierDelState { get; set; } + public DbSet SUPPLIER_DEL_STATE { get; set; } /// /// 退货单 /// - public DbSet SupplierReturn { get; set; } + public DbSet SUPPLIER_RETURN { get; set; } /// /// 奇瑞RDC共享库存 /// - public DbSet SupplierInvData { get; set; } + public DbSet SUPPLIER_INV_DATA { get; set; } /// /// 供应商共享库存 /// - public DbSet SupplierSInvData { get; set; } + public DbSet SUPPLIER_SINV_DATA { get; set; } /// /// 日MRP状态监控 /// - public DbSet SupplierMrpState { get; set; } + public DbSet SUPPLIER_MRP_STATE { get; set; } public DbSet TaskLogs { get; set; } diff --git a/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs b/API/TaskManager.EntityFramework/Migrations/20250528092555_init.Designer.cs similarity index 83% rename from API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs rename to API/TaskManager.EntityFramework/Migrations/20250528092555_init.Designer.cs index 00b5e39..2f77ab4 100644 --- a/API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs +++ b/API/TaskManager.EntityFramework/Migrations/20250528092555_init.Designer.cs @@ -1,6 +1,5 @@ // using System; -using CherryTaskManager; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -10,23 +9,168 @@ using TaskManager.EntityFramework; #nullable disable -namespace CherryTaskManager.Migrations +namespace TaskManager.EntityFramework.Migrations { [DbContext(typeof(JobDbContext))] - [Migration("20250526065431_Init")] - partial class Init + [Migration("20250528092555_init")] + partial class init { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.5") + .HasAnnotation("ProductVersion", "8.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_BOM", b => + modelBuilder.Entity("TaskManager.Entity.Entitys.SUPPLIER_PRO_STATION_FIRST_PASSYIELD", b => + { + b.Property("UId") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UId")); + + b.Property("AcceptableNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("CheryProductName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("CheryProductNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("DateTime") + .IsRequired() + .HasMaxLength(19) + .HasColumnType("CHAR"); + + b.Property("DefectiveNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("ManufactureNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("OncePassRateRealValue") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("OncePassRateTagValue") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("PlantId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("PlantName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("ProductBatchNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("ProductionLineId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("ProductionLineName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("ReadState") + .HasColumnType("bit"); + + b.Property("Remark") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("NVarchar"); + + b.Property("StationId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("StationName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("StatisticalTime") + .IsRequired() + .HasMaxLength(19) + .HasColumnType("CHAR"); + + b.Property("SupplierCode") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("SupplierName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + + b.Property("VendorProductName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("VendorProductNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("WorkOrderNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("WorkShift") + .IsRequired() + .HasMaxLength(10) + .HasColumnType("VARCHAR"); + + b.Property("WorkshopId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("WorkshopName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("WriteState") + .HasColumnType("bit"); + + b.HasKey("UId"); + + b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD", (string)null); + }); + + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_BOM", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -44,6 +188,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -52,7 +199,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_BOM"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_DATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_DATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -191,6 +338,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -207,7 +357,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_DATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_MMRP", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_MMRP", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -289,6 +439,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -305,7 +458,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_MMRP"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_PO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_PO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -346,6 +499,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -362,7 +518,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_PO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_DEL_STATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_DEL_STATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -388,8 +544,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -420,6 +576,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("RoadReceiveTime") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -440,6 +600,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -458,7 +621,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_DEL_STATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_EMPLOYEE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_EMPLOYEE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -476,6 +639,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -484,7 +650,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_EMPLOYEE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_INFO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_INFO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -502,6 +668,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -510,7 +679,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_INFO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_INV_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_INV_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -532,8 +701,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -564,10 +733,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StockState") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -586,7 +762,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_INV_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_DATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_DATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -605,8 +781,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -735,10 +911,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StartDate") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -758,7 +941,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_DATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_MONTH", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_MONTH", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -776,8 +959,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .IsRequired() @@ -850,10 +1033,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StartMonth") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -872,7 +1062,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_MONTH"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_STATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_STATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -909,8 +1099,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -953,6 +1143,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SummaryCreatQuantity") .HasColumnType("int"); @@ -969,6 +1163,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -987,7 +1184,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_STATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1022,8 +1219,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1077,6 +1274,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SerialNumber") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1085,6 +1286,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("TradeTerms") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1112,7 +1316,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_ATTACHMENT_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_ATTACHMENT_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1130,6 +1334,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1138,7 +1345,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_ATTACHMENT_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_CPS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_CPS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1156,6 +1363,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1164,7 +1374,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_CPS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_CSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_CSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1186,8 +1396,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1239,6 +1449,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SortDate") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1247,6 +1461,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1269,7 +1486,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_CSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1287,6 +1504,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1295,7 +1515,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_ENVIRONMENT", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_ENVIRONMENT", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1313,6 +1533,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1321,7 +1544,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_ENVIRONMENT"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_FIRST_PASSYIELD", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_FIRST_PASSYIELD", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1339,6 +1562,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1347,7 +1573,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_FIRST_PASSYIELD"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_FLAW", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_FLAW", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1365,6 +1591,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1373,7 +1602,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_FLAW"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_HSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_HSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1391,8 +1620,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1432,6 +1661,13 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1454,7 +1690,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_HSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_MATERIAL_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_MATERIAL_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1472,6 +1708,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1480,7 +1719,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_MATERIAL_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_MATERIAL_STOCK", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_MATERIAL_STOCK", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1498,6 +1737,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1506,7 +1748,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_MATERIAL_STOCK"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1524,6 +1766,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1532,7 +1777,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_OEE_TIME_DETAILS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_OEE_TIME_DETAILS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1550,6 +1795,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1558,7 +1806,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_OEE_TIME_DETAILS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PLANING", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PLANING", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1635,6 +1883,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SalseDepartment") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1643,6 +1895,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("Type") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1665,7 +1920,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PLANING"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PROCESS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PROCESS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1683,6 +1938,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1691,7 +1949,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PROCESS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PROCESS_EQUIPMENT", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PROCESS_EQUIPMENT", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1709,6 +1967,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1717,7 +1978,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PROCESS_EQUIPMENT"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_SCHEDULING", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_SCHEDULING", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1735,41 +1996,18 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("WriteState") - .HasColumnType("bit"); - - b.HasKey("UId"); - - b.ToTable("SUPPLIER_PRO_SCHEDULING"); - }); - - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_STATION_FIRST_PASSYIELD", b => - { - b.Property("UId") - .ValueGeneratedOnAdd() - .HasColumnType("bigint"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UId")); - - b.Property("CreationTime") - .HasColumnType("datetime2"); - - b.Property("ReadState") - .HasColumnType("bit"); - - b.Property("Remark") - .IsRequired() - .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); b.Property("WriteState") .HasColumnType("bit"); b.HasKey("UId"); - b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD"); + b.ToTable("SUPPLIER_PRO_SCHEDULING"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_TSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_TSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1795,8 +2033,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1832,6 +2070,13 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1854,7 +2099,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_TSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_RETURN", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_RETURN", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1880,8 +2125,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1924,6 +2169,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("ReturnNumber") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1944,6 +2193,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1962,7 +2214,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_RETURN"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_SA_WEEK", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_SA_WEEK", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1984,8 +2236,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -2016,6 +2268,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("ScheduleAgreement") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2024,6 +2280,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2042,7 +2301,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_SA_WEEK"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_SINV_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_SINV_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -2057,6 +2316,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); + b.Property("InventoryStatus") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2090,6 +2352,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SafetyStock") .HasColumnType("int"); @@ -2109,6 +2375,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -2117,7 +2386,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_SINV_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.TaskConifgure", b => + modelBuilder.Entity("TaskManager.Entity.TaskConifgure", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -2133,6 +2402,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("CreationTime") + .HasColumnType("datetime2"); + b.Property("IsAuto") .HasColumnType("bit"); @@ -2140,6 +2412,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("ReadState") + .HasColumnType("bit"); + b.Property("Remark") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2148,6 +2423,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("TaskName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2156,12 +2434,15 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("WriteState") + .HasColumnType("bit"); + b.HasKey("UId"); b.ToTable("TaskConifgure"); }); - modelBuilder.Entity("TaskManager.Controllers.TaskLog", b => + modelBuilder.Entity("TaskManager.Entity.TaskLog", b => { b.Property("UId") .ValueGeneratedOnAdd() diff --git a/API/CherryTaskManager/Migrations/20250526065431_Init.cs b/API/TaskManager.EntityFramework/Migrations/20250528092555_init.cs similarity index 86% rename from API/CherryTaskManager/Migrations/20250526065431_Init.cs rename to API/TaskManager.EntityFramework/Migrations/20250528092555_init.cs index 9a04bea..089c133 100644 --- a/API/CherryTaskManager/Migrations/20250526065431_Init.cs +++ b/API/TaskManager.EntityFramework/Migrations/20250528092555_init.cs @@ -3,10 +3,10 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace CherryTaskManager.Migrations +namespace TaskManager.EntityFramework.Migrations { /// - public partial class Init : Migration + public partial class init : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -20,7 +20,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -76,7 +77,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -113,7 +115,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -137,7 +140,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -150,7 +154,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), DeliveryNumber = table.Column(type: "nvarchar(max)", nullable: false), SerialNumber = table.Column(type: "nvarchar(max)", nullable: false), SerialSrate = table.Column(type: "nvarchar(max)", nullable: false), @@ -172,7 +175,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -188,7 +194,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -204,7 +211,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -217,7 +225,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), PlantId = table.Column(type: "nvarchar(max)", nullable: false), PlantName = table.Column(type: "nvarchar(max)", nullable: false), MaterialCode = table.Column(type: "nvarchar(max)", nullable: false), @@ -234,7 +241,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -247,7 +257,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), ReleaseEdition = table.Column(type: "nvarchar(max)", nullable: false), MaterialCode = table.Column(type: "nvarchar(max)", nullable: false), MaterialDescription = table.Column(type: "nvarchar(max)", nullable: false), @@ -295,7 +304,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -308,7 +320,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), ReleaseEdition = table.Column(type: "nvarchar(max)", nullable: false), MaterialCode = table.Column(type: "nvarchar(max)", nullable: false), MaterialDescription = table.Column(type: "nvarchar(max)", nullable: false), @@ -337,7 +348,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -350,7 +364,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), PlantId = table.Column(type: "nvarchar(max)", nullable: false), PlantName = table.Column(type: "nvarchar(max)", nullable: false), DemandSrate = table.Column(type: "nvarchar(max)", nullable: false), @@ -379,7 +392,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -392,7 +408,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), PurchaseOrder = table.Column(type: "nvarchar(max)", nullable: false), SerialNumber = table.Column(type: "nvarchar(max)", nullable: false), PlantId = table.Column(type: "nvarchar(max)", nullable: false), @@ -421,7 +436,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -437,7 +455,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -453,7 +472,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -466,7 +486,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), Models = table.Column(type: "nvarchar(max)", nullable: false), Vin = table.Column(type: "nvarchar(max)", nullable: false), ProductionLineId = table.Column(type: "nvarchar(max)", nullable: false), @@ -490,7 +509,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -506,7 +528,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -522,7 +545,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -538,7 +562,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -554,7 +579,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -567,7 +593,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), Models = table.Column(type: "nvarchar(max)", nullable: false), Vin = table.Column(type: "nvarchar(max)", nullable: false), ProductionLineId = table.Column(type: "nvarchar(max)", nullable: false), @@ -585,7 +610,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -601,7 +629,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -617,7 +646,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -633,7 +663,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -649,7 +680,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -683,12 +715,14 @@ namespace CherryTaskManager.Migrations CreateTime = table.Column(type: "datetime2", nullable: true), Plant = table.Column(type: "nvarchar(max)", nullable: false), Assembly = table.Column(type: "nvarchar(max)", nullable: false), - Id = table.Column(type: "nvarchar(max)", nullable: true), CreateByUser = table.Column(type: "nvarchar(max)", nullable: false), WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -704,7 +738,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -720,7 +755,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -736,7 +772,8 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -749,10 +786,35 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), + SupplierCode = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + SupplierName = table.Column(type: "VARCHAR(64)", maxLength: 64, nullable: false), + PlantId = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + PlantName = table.Column(type: "VARCHAR(64)", maxLength: 64, nullable: false), + WorkshopId = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + WorkshopName = table.Column(type: "VARCHAR(64)", maxLength: 64, nullable: false), + ProductionLineId = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + ProductionLineName = table.Column(type: "VARCHAR(100)", maxLength: 100, nullable: false), + StationId = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + StationName = table.Column(type: "VARCHAR(64)", maxLength: 64, nullable: false), + CheryProductNo = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + CheryProductName = table.Column(type: "VARCHAR(100)", maxLength: 100, nullable: false), + VendorProductNo = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + VendorProductName = table.Column(type: "VARCHAR(100)", maxLength: 100, nullable: false), + ProductBatchNo = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + ManufactureNo = table.Column(type: "VARCHAR(32)", maxLength: 32, nullable: false), + WorkOrderNumber = table.Column(type: "DECIMAL(16,5)", precision: 16, scale: 5, nullable: false), + DefectiveNumber = table.Column(type: "DECIMAL(16,5)", precision: 16, scale: 5, nullable: false), + AcceptableNumber = table.Column(type: "DECIMAL(16,5)", precision: 16, scale: 5, nullable: false), + OncePassRateRealValue = table.Column(type: "DECIMAL(16,5)", precision: 16, scale: 5, nullable: false), + OncePassRateTagValue = table.Column(type: "DECIMAL(16,5)", precision: 16, scale: 5, nullable: false), + WorkShift = table.Column(type: "VARCHAR(10)", maxLength: 10, nullable: false), + StatisticalTime = table.Column(type: "CHAR(19)", maxLength: 19, nullable: false), + DateTime = table.Column(type: "CHAR(19)", maxLength: 19, nullable: false), WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "NVarchar(500)", maxLength: 500, nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { @@ -765,7 +827,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), Models = table.Column(type: "nvarchar(max)", nullable: false), Vin = table.Column(type: "nvarchar(max)", nullable: false), ProductionLineId = table.Column(type: "nvarchar(max)", nullable: false), @@ -784,7 +845,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -797,7 +861,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), ReturnNumber = table.Column(type: "nvarchar(max)", nullable: false), SerialNumber = table.Column(type: "nvarchar(max)", nullable: false), SerialSrate = table.Column(type: "nvarchar(max)", nullable: false), @@ -822,7 +885,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -835,7 +901,6 @@ namespace CherryTaskManager.Migrations { UId = table.Column(type: "bigint", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), - Id = table.Column(type: "int", nullable: false), ScheduleAgreement = table.Column(type: "nvarchar(max)", nullable: false), SerialNumber = table.Column(type: "nvarchar(max)", nullable: false), MaterialCode = table.Column(type: "nvarchar(max)", nullable: false), @@ -853,7 +918,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -882,7 +950,10 @@ namespace CherryTaskManager.Migrations WriteState = table.Column(type: "bit", nullable: false), ReadState = table.Column(type: "bit", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), - Remark = table.Column(type: "nvarchar(max)", nullable: false) + Remark = table.Column(type: "nvarchar(max)", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false), + RequestDate = table.Column(type: "nvarchar(max)", nullable: false), + Id = table.Column(type: "nvarchar(max)", nullable: true) }, constraints: table => { @@ -902,7 +973,11 @@ namespace CherryTaskManager.Migrations TableName = table.Column(type: "nvarchar(max)", nullable: false), TaskName = table.Column(type: "nvarchar(max)", nullable: false), Url = table.Column(type: "nvarchar(max)", nullable: false), - IsAuto = table.Column(type: "bit", nullable: false) + IsAuto = table.Column(type: "bit", nullable: false), + WriteState = table.Column(type: "bit", nullable: false), + ReadState = table.Column(type: "bit", nullable: false), + CreationTime = table.Column(type: "datetime2", nullable: false), + TaskId = table.Column(type: "uniqueidentifier", nullable: false) }, constraints: table => { diff --git a/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs b/API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs similarity index 83% rename from API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs rename to API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs index 5c1c319..97fd747 100644 --- a/API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs +++ b/API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs @@ -1,6 +1,5 @@ // using System; -using CherryTaskManager; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; @@ -9,7 +8,7 @@ using TaskManager.EntityFramework; #nullable disable -namespace CherryTaskManager.Migrations +namespace TaskManager.EntityFramework.Migrations { [DbContext(typeof(JobDbContext))] partial class JobDbContextModelSnapshot : ModelSnapshot @@ -18,12 +17,157 @@ namespace CherryTaskManager.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.5") + .HasAnnotation("ProductVersion", "8.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_BOM", b => + modelBuilder.Entity("TaskManager.Entity.Entitys.SUPPLIER_PRO_STATION_FIRST_PASSYIELD", b => + { + b.Property("UId") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UId")); + + b.Property("AcceptableNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("CheryProductName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("CheryProductNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("DateTime") + .IsRequired() + .HasMaxLength(19) + .HasColumnType("CHAR"); + + b.Property("DefectiveNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("ManufactureNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("OncePassRateRealValue") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("OncePassRateTagValue") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("PlantId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("PlantName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("ProductBatchNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("ProductionLineId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("ProductionLineName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("ReadState") + .HasColumnType("bit"); + + b.Property("Remark") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("NVarchar"); + + b.Property("StationId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("StationName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("StatisticalTime") + .IsRequired() + .HasMaxLength(19) + .HasColumnType("CHAR"); + + b.Property("SupplierCode") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("SupplierName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + + b.Property("VendorProductName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("VARCHAR"); + + b.Property("VendorProductNo") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("WorkOrderNumber") + .HasPrecision(16, 5) + .HasColumnType("DECIMAL"); + + b.Property("WorkShift") + .IsRequired() + .HasMaxLength(10) + .HasColumnType("VARCHAR"); + + b.Property("WorkshopId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("VARCHAR"); + + b.Property("WorkshopName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("VARCHAR"); + + b.Property("WriteState") + .HasColumnType("bit"); + + b.HasKey("UId"); + + b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD", (string)null); + }); + + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_BOM", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -41,6 +185,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -49,7 +196,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_BOM"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_DATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_DATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -188,6 +335,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -204,7 +354,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_DATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_MMRP", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_MMRP", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -286,6 +436,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -302,7 +455,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_MMRP"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_CON_PO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_CON_PO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -343,6 +496,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("VentureSpecific") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -359,7 +515,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_CON_PO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_DEL_STATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_DEL_STATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -385,8 +541,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -417,6 +573,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("RoadReceiveTime") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -437,6 +597,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -455,7 +618,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_DEL_STATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_EMPLOYEE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_EMPLOYEE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -473,6 +636,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -481,7 +647,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_EMPLOYEE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_INFO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_INFO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -499,6 +665,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -507,7 +676,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_INFO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_INV_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_INV_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -529,8 +698,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -561,10 +730,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StockState") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -583,7 +759,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_INV_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_DATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_DATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -602,8 +778,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -732,10 +908,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StartDate") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -755,7 +938,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_DATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_MONTH", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_MONTH", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -773,8 +956,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .IsRequired() @@ -847,10 +1030,17 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("StartMonth") .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -869,7 +1059,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_MONTH"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_MRP_STATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_MRP_STATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -906,8 +1096,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -950,6 +1140,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SummaryCreatQuantity") .HasColumnType("int"); @@ -966,6 +1160,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -984,7 +1181,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_MRP_STATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PO", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PO", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1019,8 +1216,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1074,6 +1271,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SerialNumber") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1082,6 +1283,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("TradeTerms") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1109,7 +1313,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PO"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_ATTACHMENT_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_ATTACHMENT_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1127,6 +1331,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1135,7 +1342,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_ATTACHMENT_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_CPS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_CPS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1153,6 +1360,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1161,7 +1371,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_CPS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_CSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_CSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1183,8 +1393,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1236,6 +1446,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SortDate") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1244,6 +1458,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1266,7 +1483,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_CSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1284,6 +1501,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1292,7 +1512,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_ENVIRONMENT", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_ENVIRONMENT", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1310,6 +1530,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1318,7 +1541,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_ENVIRONMENT"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_FIRST_PASSYIELD", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_FIRST_PASSYIELD", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1336,6 +1559,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1344,7 +1570,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_FIRST_PASSYIELD"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_FLAW", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_FLAW", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1362,6 +1588,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1370,7 +1599,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_FLAW"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_HSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_HSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1388,8 +1617,8 @@ namespace CherryTaskManager.Migrations b.Property("CreationTime") .HasColumnType("datetime2"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1429,6 +1658,13 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1451,7 +1687,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_HSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_MATERIAL_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_MATERIAL_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1469,6 +1705,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1477,7 +1716,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_MATERIAL_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_MATERIAL_STOCK", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_MATERIAL_STOCK", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1495,6 +1734,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1503,7 +1745,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_MATERIAL_STOCK"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1521,6 +1763,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1529,7 +1774,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_OEE_TIME_DETAILS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_OEE_TIME_DETAILS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1547,6 +1792,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1555,7 +1803,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_OEE_TIME_DETAILS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PLANING", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PLANING", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1632,6 +1880,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SalseDepartment") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1640,6 +1892,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("Type") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1662,7 +1917,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PLANING"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PROCESS", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PROCESS", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1680,6 +1935,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1688,7 +1946,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PROCESS"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_PROCESS_EQUIPMENT", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_PROCESS_EQUIPMENT", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1706,6 +1964,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -1714,7 +1975,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_PROCESS_EQUIPMENT"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_SCHEDULING", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_SCHEDULING", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1732,41 +1993,18 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("WriteState") - .HasColumnType("bit"); - - b.HasKey("UId"); - - b.ToTable("SUPPLIER_PRO_SCHEDULING"); - }); - - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_STATION_FIRST_PASSYIELD", b => - { - b.Property("UId") - .ValueGeneratedOnAdd() - .HasColumnType("bigint"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("UId")); - - b.Property("CreationTime") - .HasColumnType("datetime2"); - - b.Property("ReadState") - .HasColumnType("bit"); - - b.Property("Remark") - .IsRequired() - .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); b.Property("WriteState") .HasColumnType("bit"); b.HasKey("UId"); - b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD"); + b.ToTable("SUPPLIER_PRO_SCHEDULING"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_PRO_TSCHEDUL", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_PRO_TSCHEDUL", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1792,8 +2030,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1829,6 +2067,13 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1851,7 +2096,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_PRO_TSCHEDUL"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_RETURN", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_RETURN", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1877,8 +2122,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -1921,6 +2166,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("ReturnNumber") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1941,6 +2190,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -1959,7 +2211,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_RETURN"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_SA_WEEK", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_SA_WEEK", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -1981,8 +2233,8 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); - b.Property("Id") - .HasColumnType("int"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); b.Property("IsDelete") .HasColumnType("int"); @@ -2013,6 +2265,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("ScheduleAgreement") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2021,6 +2277,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("UpdateByUser") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2039,7 +2298,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_SA_WEEK"); }); - modelBuilder.Entity("TaskManager.Controllers.SUPPLIER_SINV_DATA", b => + modelBuilder.Entity("TaskManager.Entity.SUPPLIER_SINV_DATA", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -2054,6 +2313,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("Id") + .HasColumnType("nvarchar(max)"); + b.Property("InventoryStatus") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2087,6 +2349,10 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("RequestDate") + .IsRequired() + .HasColumnType("nvarchar(max)"); + b.Property("SafetyStock") .HasColumnType("int"); @@ -2106,6 +2372,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("WriteState") .HasColumnType("bit"); @@ -2114,7 +2383,7 @@ namespace CherryTaskManager.Migrations b.ToTable("SUPPLIER_SINV_DATA"); }); - modelBuilder.Entity("TaskManager.Controllers.TaskConifgure", b => + modelBuilder.Entity("TaskManager.Entity.TaskConifgure", b => { b.Property("UId") .ValueGeneratedOnAdd() @@ -2130,6 +2399,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("CreationTime") + .HasColumnType("datetime2"); + b.Property("IsAuto") .HasColumnType("bit"); @@ -2137,6 +2409,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("ReadState") + .HasColumnType("bit"); + b.Property("Remark") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2145,6 +2420,9 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("TaskId") + .HasColumnType("uniqueidentifier"); + b.Property("TaskName") .IsRequired() .HasColumnType("nvarchar(max)"); @@ -2153,12 +2431,15 @@ namespace CherryTaskManager.Migrations .IsRequired() .HasColumnType("nvarchar(max)"); + b.Property("WriteState") + .HasColumnType("bit"); + b.HasKey("UId"); b.ToTable("TaskConifgure"); }); - modelBuilder.Entity("TaskManager.Controllers.TaskLog", b => + modelBuilder.Entity("TaskManager.Entity.TaskLog", b => { b.Property("UId") .ValueGeneratedOnAdd() diff --git a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj index 1710eda..00e9783 100644 --- a/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj +++ b/API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj @@ -24,4 +24,8 @@ + + + + diff --git a/API/Wood.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index 96a8f93..5f9f4d4 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -270,6 +270,11 @@ namespace Wood.Admin.WebApi options.OperationFilter(); #endregion }); + //services.BuildServiceProvider().GetRequiredService() + + + + } /// diff --git a/API/Wood.Admin.WebApi/appsettings.json b/API/Wood.Admin.WebApi/appsettings.json index 31b9f30..85671ec 100644 --- a/API/Wood.Admin.WebApi/appsettings.json +++ b/API/Wood.Admin.WebApi/appsettings.json @@ -20,7 +20,7 @@ "DBEnableDiffLog": true, //是否开启差异化日志 "LogDays": 90, //系统日志保存的天数 "RunAutoJob": true, //是否执行自动job - "CustomerDb": "Server = 192.168.1.228; Database = TaskManager1; User ID = sa; Password = ChangkeTec@2021; TrustServerCertificate = True" + "CustomerDb": "Server=192.168.1.228; Database=TaskManager1; User ID = sa; Password=ChangkeTec@2021; TrustServerCertificate = True" }, "JwtConfig": { "SecretKey": "3c1cac3f546eda35168c3aa3cn91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16 diff --git a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs index f0ecf98..5fd118e 100644 --- a/API/Wood.Service/Controllers/RecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/RecurringJobOutPageController.cs @@ -197,7 +197,7 @@ namespace TaskManager.Controllers } [NonAction] - public async Task TestAsync(string url, string path, string taskName, string inputdate) + public virtual async Task TestAsync(string url, string path, string taskName, string inputdate) { Url = url; Path = path; @@ -229,6 +229,7 @@ namespace TaskManager.Controllers [HttpPost] public async Task> Create(T entity) { + entity.CreationTime=DateTime.Now; var createdEntity = await _repository.AddAsync(entity); return CreatedAtAction(nameof(GetById), new { id = createdEntity.Id }, createdEntity); } @@ -239,22 +240,19 @@ namespace TaskManager.Controllers var _first=await _repository.GetByIdAsync(entity.UId); if (_first == null) { - return BadRequest(); + return new JsonResult(new { Code = 400, Message = "修改失败!" }); } - - - - + await _repository.UpdateAsync(entity); - return NoContent(); + return new JsonResult(new { Code = 200, Message = "修改成功!" }); } [HttpDelete("{id}")] public async Task Delete(int id) { await _repository.DeleteAsync(id); - return NoContent(); + return new JsonResult(new { Code = 200, Message = "删除成功!" }); ; } [HttpGet] public async Task>> GetPaged( diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 2d8bd84..c534af9 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -7,27 +7,32 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; using System; using System.IO; +using System.Linq.Expressions; using System.Threading.Tasks; using TaskManager.Controllers; using TaskManager.Entity; using TaskManager.EntityFramework; +using TaskManager.EntityFramework.Repository; namespace TaskManager.Controllers { //[ApiController] //[Route("[controller]")] - public class TaskConifgureController :ControllerBase + public class TaskConifgureController : ControllerBase { private readonly JobDbContext _context; private readonly IServiceProvider _builder; private readonly IConfiguration _configuration; - public TaskConifgureController(JobDbContext context, IServiceProvider builder, IConfiguration configuration) + private readonly IRepository _repository; + public TaskConifgureController(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository repository) { _builder = builder; _context = context; _configuration = configuration; + _repository = repository; } /// /// 请除所有任务 @@ -49,22 +54,22 @@ namespace TaskManager.Controllers /// /// /// - [HttpPost(Name = "ExecuteTask")] + [NonAction] public async Task ExecuteTask(string taskName) { - var first=await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); + var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); var url = first.Url; var path = first.Api; var controller = _builder.GetRequiredService(); - await controller.ExecuteAsync(url,path, taskName); + await controller.ExecuteAsync(url, path, taskName); + - } /// @@ -72,7 +77,7 @@ namespace TaskManager.Controllers /// /// /// - [HttpGet(Name = "testTask")] + [NonAction] public async Task testTask(string taskName) { var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); @@ -80,7 +85,7 @@ namespace TaskManager.Controllers var path = first.Api; var controller = _builder.GetRequiredService(); - await controller.TestAsync(url, path, taskName,"2025-04-21"); + await controller.TestAsync(url, path, taskName, "2025-04-21"); @@ -93,17 +98,14 @@ namespace TaskManager.Controllers - - - public async Task RefreshTaskConfig() { - + // 从数据库加载所有任务配置 var tasks = _context.TaskConifgure.Where(p => p.IsAuto == true && !string.IsNullOrEmpty(p.Corn) && !string.IsNullOrEmpty(p.Api) && !string.IsNullOrEmpty(p.Url)).ToList(); - var delTasks = _context.TaskConifgure.Where(p => p.IsAuto == false || string.IsNullOrEmpty(p.Corn) + var delTasks = _context.TaskConifgure.Where(p => p.IsAuto == false || string.IsNullOrEmpty(p.Corn) || string.IsNullOrEmpty(p.Api) || string.IsNullOrEmpty(p.Url) ).ToList(); @@ -111,304 +113,304 @@ namespace TaskManager.Controllers { var url = task.Url; var path = task.Api; - - - - switch (task.TaskName) - { - //case "来料检验数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url,path,task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "排产数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "供应商基础信息": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "人员资质信息": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "BOM主数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "过程控制项质量数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "生产过程数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "产品一次合格率": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "工位一次合格率": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "缺陷业务数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "环境业务数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "设备OEE达成率": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "OEE时间明细": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "物料主数据": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "工艺装备": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - //case "工艺": - // RecurringJob.AddOrUpdate( - // task.TaskName, - // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - // task.Corn, - // TimeZoneInfo.Local - // ); - // break; - - case "整车月度生产计划1": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "M+6月物料需求计划1": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "整车月度生产计划2": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "M+6月物料需求计划2": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "日物料需求计划": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "计划协议": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "采购订单": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "过焊装未过总装": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "过涂装未过总装": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "排序供货": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "看板配送单": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "退货单": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "奇瑞RDC共享库存": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "日MRP状态监控": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "日MRP预警推移": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "M+6月物料需求计划风险确认": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "日物料需求计划风险确认": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "采购订单风险确认": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "供应商共享库存-上午": - - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - case "供应商共享库存-晚上": - RecurringJob.AddOrUpdate( - task.TaskName, - x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), - task.Corn, - TimeZoneInfo.Local - ); - break; - - } - + + + + switch (task.TaskName) + { + //case "来料检验数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url,path,task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "排产数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "供应商基础信息": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "人员资质信息": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "BOM主数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "过程控制项质量数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "生产过程数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "产品一次合格率": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "工位一次合格率": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "缺陷业务数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "环境业务数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "设备OEE达成率": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "OEE时间明细": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "物料主数据": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "工艺装备": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + //case "工艺": + // RecurringJob.AddOrUpdate( + // task.TaskName, + // x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + // task.Corn, + // TimeZoneInfo.Local + // ); + // break; + + case "整车月度生产计划1": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "M+6月物料需求计划1": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "整车月度生产计划2": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "M+6月物料需求计划2": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "日物料需求计划": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "计划协议": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "采购订单": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "过焊装未过总装": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "过涂装未过总装": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "排序供货": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "看板配送单": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "退货单": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "奇瑞RDC共享库存": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "日MRP状态监控": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "日MRP预警推移": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "M+6月物料需求计划风险确认": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "日物料需求计划风险确认": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "采购订单风险确认": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "供应商共享库存-上午": + + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + case "供应商共享库存-晚上": + RecurringJob.AddOrUpdate( + task.TaskName, + x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName), + task.Corn, + TimeZoneInfo.Local + ); + break; + + } + } foreach (var task in delTasks) { @@ -559,7 +561,7 @@ namespace TaskManager.Controllers // 移除指定的定时任务 RecurringJob.RemoveIfExists(task.TaskName); break; - + } } @@ -568,11 +570,79 @@ namespace TaskManager.Controllers } + [HttpGet] + public async Task>> GetAll() + { + return await _repository.GetAllAsync() as List; + } - // 使用 Hangfire 注册定时任务 - // Console.WriteLine($"已注册定时任务: {task.TaskName}, Cron: {task.Corn}"); + [HttpGet("{id}")] + public async Task> GetById(int id) + { + var entity = await _repository.GetByIdAsync(id); + if (entity == null) return NotFound(); + return entity; } + + [HttpPost] + public async Task> Create(TaskConifgure entity) + { + entity.CreationTime = DateTime.Now; + var createdEntity = await _repository.AddAsync(entity); + return new JsonResult(new { Code = 200, Message = "创建成功!" }); + } + + [HttpPut("{id}")] + public async Task Update(TaskConifgure entity) + { + var _first = await _repository.GetByIdAsync(entity.UId); + if (_first == null) + { + return new JsonResult(new { Code = 400, Message = "修改失败!" }); + } + + + await _repository.UpdateAsync(entity); + return new JsonResult(new { Code = 200, Message = "修改成功!" }); + } + + [HttpDelete("{id}")] + public async Task Delete(int id) + { + await _repository.DeleteAsync(id); + return new JsonResult(new { Code = 200, Message = "删除成功!" }); ; + } + [HttpGet] + public async Task>> GetPaged( + [FromQuery] int pageNumber = 1, + [FromQuery] int pageSize = 10, + [FromQuery] string sortBy = "", + [FromQuery] bool isAscending = true, + [FromQuery] Dictionary filters = null) + { + var pagingParams = new PagingParams + { + PageNumber = pageNumber, + PageSize = pageSize, + SortBy = sortBy, + IsAscending = isAscending, + Filters = filters + }; + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); + return Ok(pagedResult); + } + + + + + // 使用 Hangfire 注册定时任务 + // Console.WriteLine($"已注册定时任务: {task.TaskName}, Cron: {task.Corn}"); } +}