Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

API/CherryTaskManager/Migrations/20250526065431_Init.Designer.cs

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using TaskManager.EntityFramework;
 
 #nullable disable
 

API/CherryTaskManager/Migrations/JobDbContextModelSnapshot.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using TaskManager.EntityFramework;
 
 #nullable disable
 

API/TaskManager.Entity/Entity.cs

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

API/TaskManager.Entity/Entitys/10_17/Class1.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TaskManager.Entity.Entitys._10_17
-{
-    internal class Class1
-    {
-    }
-}

API/TaskManager.Entity/Entitys/10_17/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs

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

API/TaskManager.EntityFramework/JobDbContext.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
 using Wood.Util;
 
 
@@ -247,15 +248,78 @@ namespace TaskManager.EntityFramework
             //});
 
             // 配置表名
-          
+
 
             // 其他配置...
+
+
+
+
+            //工位一次合格率
+            modelBuilder.Entity<SUPPLIER_PRO_STATION_FIRST_PASSYIELD>(b =>
+            {
+                b.ToTable("SUPPLIER_PRO_STATION_FIRST_PASSYIELD");
+                //供应商代码
+                b.Property(e => e.SupplierCode).HasColumnType("VARCHAR").HasMaxLength(32);
+                //供应商名称
+                b.Property(e => e.SupplierName).HasColumnType("VARCHAR").HasMaxLength(64);
+                //工厂代码
+                b.Property(e => e.PlantId).HasColumnType("VARCHAR").HasMaxLength(32);
+                //工厂名称
+                b.Property(e => e.PlantName).HasColumnType("VARCHAR").HasMaxLength(64);
+                //车间代码
+                b.Property(e => e.WorkshopId).HasColumnType("VARCHAR").HasMaxLength(32);
+                //车间名称
+                b.Property(e => e.WorkshopName).HasColumnType("VARCHAR").HasMaxLength(64);
+                //产线代码
+                b.Property(e => e.ProductionLineId).HasColumnType("VARCHAR").HasMaxLength(32);
+                //产线名称
+                b.Property(e => e.ProductionLineName).HasColumnType("VARCHAR").HasMaxLength(100);
+                //工位代码
+                b.Property(e => e.StationId).HasColumnType("VARCHAR").HasMaxLength(32);
+                //工位名称
+                b.Property(e => e.StationName).HasColumnType("VARCHAR").HasMaxLength(64);
+                //奇瑞零件号
+                b.Property(e => e.CheryProductNo).HasColumnType("VARCHAR").HasMaxLength(32);
+                //奇瑞零件名称
+                b.Property(e => e.CheryProductName).HasColumnType("VARCHAR").HasMaxLength(100);
+                //供应商总成零件号
+                b.Property(e => e.VendorProductNo).HasColumnType("VARCHAR").HasMaxLength(32);
+                //供应商总成零件名称
+                b.Property(e => e.VendorProductName).HasColumnType("VARCHAR").HasMaxLength(100);
+                //生产批次号
+                b.Property(e => e.ProductBatchNo).HasColumnType("VARCHAR").HasMaxLength(32);
+                //生产工单号,(跟排产工单号关联)
+                b.Property(e => e.ManufactureNo).HasColumnType("VARCHAR").HasMaxLength(32);
+                //批次计划数量
+                b.Property(e => e.WorkOrderNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5);
+                //不合格数
+                b.Property(e => e.DefectiveNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5);
+                //合格数
+                b.Property(e => e.AcceptableNumber).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5);
+                //一次合格率实际值,使用小数表示，如0.9601表示合格率为96.01%整数位最多10位，小数位最多3位
+                b.Property(e => e.OncePassRateRealValue).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5);
+                //一次合格率目标值,使用小数表示，如0.96表示合格率目标为96.00%。整数位最多10位，小数位最多3位
+                b.Property(e => e.OncePassRateTagValue).HasColumnType("DECIMAL").HasPrecision(precision: 16, scale: 5);
+                //班次,班次如何区分需备注(白班，晚班，中班)
+                b.Property(e => e.WorkShift).HasColumnType("VARCHAR").HasMaxLength(10);
+                //生产日期,格式(yyyy-MM-ddHH:mm:ss)
+                b.Property(e => e.StatisticalTime).HasColumnType("CHAR").HasMaxLength(19);
+                //值统计时间,格式(yyyy-MM-ddHH:mm:ss)
+                b.Property(e => e.DateTime).HasColumnType("CHAR").HasMaxLength(19);
+                b.Property(e => e.UId).HasColumnType("bigint").ValueGeneratedOnAdd().IsRequired();
+                b.Property(e => e.Remark).HasColumnType("NVarchar").HasMaxLength(500);
+                b.HasKey(e => e.UId);
+
+            });
+
+
         }
 
 
 
 
-     
+
 
     }
 }

API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj

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