浏览代码

SQE合并

Pengxy 10 月之前
父节点
当前提交
ad07c0cf8d
共有 24 个文件被更改,包括 1440 次插入482 次删除
  1. 29 21
      MicroServices/Business/Business.Application.Contracts/Sqe/ISqeExcelService.cs
  2. 492 455
      MicroServices/Business/Business.Application/SqeManagement/SqeExcelService.cs
  3. 7 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process.cs
  4. 6 1
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process_data.cs
  5. 9 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process_standard.cs
  6. 7 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test.cs
  7. 6 1
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test_data.cs
  8. 9 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test_standard.cs
  9. 41 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct.cs
  10. 77 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct_data.cs
  11. 4 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_file_data.cs
  12. 4 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_file_upload.cs
  13. 41 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fpy.cs
  14. 84 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fpy_data.cs
  15. 41 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op.cs
  16. 101 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op_data.cs
  17. 74 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op_data_detail.cs
  18. 98 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc.cs
  19. 67 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc_data.cs
  20. 81 0
      MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc_standard.cs
  21. 111 0
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs
  22. 11 1
      MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Sqe/BusinessSqeDbContext.cs
  23. 34 3
      MicroServices/Business/Business.HttpApi/Controllers/SqeController.cs
  24. 6 0
      MicroServices/Business/QuartzSettings/logs/logs.txt

+ 29 - 21
MicroServices/Business/Business.Application.Contracts/Sqe/ISqeExcelService.cs

@@ -16,29 +16,29 @@ namespace Business.VSM
     /// </summary>
     public interface ISqeExcelService : IApplicationService
     {
-        /// <summary>
-        /// 导入检测的excel文件到DataTable
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="sheetName"></param>
-        /// <returns></returns>
-        public DataTable ImportExcelSheetToDataTable_test(string filePath, string sheetName);
+        ///// <summary>
+        ///// 导入检测的excel文件到DataTable
+        ///// </summary>
+        ///// <param name="filePath"></param>
+        ///// <param name="sheetName"></param>
+        ///// <returns></returns>
+        //public DataTable ImportExcelSheetToDataTable_test(string filePath, string sheetName);
 
-        /// <summary>
-        /// 导入过程的excel文件到DataTable
-        /// </summary>
-        /// <param name="filePath"></param>
-        /// <param name="sheetName"></param>
-        /// <returns></returns>
-        public DataTable ImportExcelSheetToDataTable_process(string filePath, string sheetName);
+        ///// <summary>
+        ///// 导入过程的excel文件到DataTable
+        ///// </summary>
+        ///// <param name="filePath"></param>
+        ///// <param name="sheetName"></param>
+        ///// <returns></returns>
+        //public DataTable ImportExcelSheetToDataTable_process(string filePath, string sheetName);
 
 
-        /// <summary>
-        /// 依据id,从sqe_file_upload和sqe_file_data,加载数据
-        /// </summary>
-        /// <param name="upload_id"></param>
-        /// <returns></returns>
-        public List<sqe_file_data> LoadData_file_data(int upload_id);
+        ///// <summary>
+        ///// 依据id,从sqe_file_upload和sqe_file_data,加载数据
+        ///// </summary>
+        ///// <param name="upload_id"></param>
+        ///// <returns></returns>
+        //public List<sqe_file_data> LoadData_file_data(int upload_id);
 
         /// <summary>
         /// 依据id,从sqe_file_upload和sqe_file_data,加载数据到因为数据表中
@@ -48,7 +48,15 @@ namespace Business.VSM
         /// <param name="create_date"></param>
         /// <param name="create_org"></param>
         /// <returns></returns>
-        public string ImportData_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
+        public string Import_Test_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
+
+        public string Import_Process_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
+
+
+        public string Import_Oqc_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
+
+        public string Import_Op_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
 
+        public string Import_Fpy_From_Data(int upload_id, string create_by, DateTime create_date, string create_org);
     }
 }

文件差异内容过多而无法显示
+ 492 - 455
MicroServices/Business/Business.Application/SqeManagement/SqeExcelService.cs


+ 7 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 核心产品CTQ过程特性
+    /// </summary>
     public class sqe_cto_process
     {
 
@@ -46,6 +50,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 原材料使用数量
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal material_used { get; set; }
 
         /// <summary>
@@ -56,6 +61,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 物料数量
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal item_qty { get; set; }
 
         /// <summary>
@@ -96,6 +102,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 抽样数
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal sampling_number { get; set; }
 
         /// <summary>

+ 6 - 1
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process_data.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 过程特性的检验数据
+    /// </summary>
     public class sqe_cto_process_data
     {
 
@@ -36,7 +40,8 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 检验值
         /// </summary>
-        public decimal data_value { get; set; }
+        [DecimalPrecision(18, 5)]
+        public decimal? data_value { get; set; }
 
         /// <summary>
         /// 检验结果状态

+ 9 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_process_standard.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 过程特性的检验标准
+    /// </summary>
     public class sqe_cto_process_standard
     {
 
@@ -26,26 +30,31 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 标准值
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_value { get; set; }
 
         /// <summary>
         /// 上公差
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal delta_up { get; set; }
 
         /// <summary>
         /// 下公差
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal delta_down { get; set; }
 
         /// <summary>
         /// 上限
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_max { get; set; }
 
         /// <summary>
         /// 下限
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_min { get; set; }
 
         /// <summary>

+ 7 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 产品过程检验记录
+    /// </summary>
     public class sqe_cto_test
     {
 
@@ -46,6 +50,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 原材料使用数量
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal material_used { get; set; }
 
         /// <summary>
@@ -56,6 +61,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 物料数量
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal item_qty { get; set; }
 
         /// <summary>
@@ -91,6 +97,7 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 抽样数
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal sampling_number { get; set; }
 
         /// <summary>

+ 6 - 1
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test_data.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 产品过程检验记录的检验数据
+    /// </summary>
     public class sqe_cto_test_data
     {
 
@@ -36,7 +40,8 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 检验值
         /// </summary>
-        public decimal ? data_value { get; set; }
+        [DecimalPrecision(18, 5)]
+        public decimal? data_value { get; set; }
 
         /// <summary>
         /// 检验结果状态

+ 9 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_cto_test_standard.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 产品过程检验记录的检验标准
+    /// </summary>
     public class sqe_cto_test_standard
     {
 
@@ -36,26 +40,31 @@ namespace Business.StructuredDB.Sqe
         /// <summary>
         /// 标准值
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_value { get; set; }
 
         /// <summary>
         /// 上公差
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal delta_up { get; set; }
 
         /// <summary>
         /// 下公差
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal delta_down { get; set; }
 
         /// <summary>
         /// 上限
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_max { get; set; }
 
         /// <summary>
         /// 下限
         /// </summary>
+        [DecimalPrecision(18, 5)]
         public decimal standard_min { get; set; }
 
         /// <summary>

+ 41 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// FCT导入信息
+    /// </summary>
+    public class sqe_fct
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 77 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct_data.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// FCT导入数据
+    /// </summary>
+    public class sqe_fct_data
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// FCT主键
+        /// </summary>
+        public Int64 fct_id { get; set; }
+
+        /// <summary>
+        /// 测试时间
+        /// </summary>
+        public DateTime test_time { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string item_no { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string item_name { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string batch_no { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_fct { get; set; }
+
+        /// <summary>
+        /// 检测结果
+        /// </summary>
+        public string test_result { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 4 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_file_data.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 上传文件明细数据
+    /// </summary>
     public class sqe_file_data
     {
 

+ 4 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_file_upload.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Business.Core.Attributes;
 using System.IO;
 
 namespace Business.StructuredDB.Sqe
 {
+    /// <summary>
+    /// 上传文件信息
+    /// </summary>
     public class sqe_file_upload
     {
 

+ 41 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fpy.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// FPY导入信息
+    /// </summary>
+    public class sqe_fpy
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 84 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fpy_data.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// FPY导入数据
+    /// </summary>
+    public class sqe_fpy_data
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// FPY主键
+        /// </summary>
+        public Int64 fpy_id { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime op_time { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string item_no { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string item_name { get; set; }
+
+        /// <summary>
+        /// 工序
+        /// </summary>
+        public string op_no { get; set; }
+
+        /// <summary>
+        /// 投入数
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_all { get; set; }
+
+        /// <summary>
+        /// 不良数
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_error { get; set; }
+
+        /// <summary>
+        /// 良品率
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal percent_ok { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 41 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// 全检工序导入信息
+    /// </summary>
+    public class sqe_op
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 101 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op_data.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// 全检工序数据
+    /// </summary>
+    public class sqe_op_data
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 全检工序主键
+        /// </summary>
+        public Int64 op_id { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime op_time { get; set; }
+
+        /// <summary>
+        /// 客户料号
+        /// </summary>
+        public string item_no { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string item_name { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string batch_no { get; set; }
+
+        /// <summary>
+        /// 工序
+        /// </summary>
+        public string op_no { get; set; }
+
+        /// <summary>
+        /// 总数量
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_all { get; set; }
+
+        /// <summary>
+        /// 良品数
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_ok { get; set; }
+
+        /// <summary>
+        /// 不良品数
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal qty_error { get; set; }
+
+        /// <summary>
+        /// 合格率
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal percent_ok { get; set; }
+
+        /// <summary>
+        /// 不良率
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal percent_error { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 74 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_op_data_detail.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// 全检工序数据明细
+    /// </summary>
+    public class sqe_op_data_detail
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 全检工序主键
+        /// </summary>
+        public Int64 op_id { get; set; }
+
+        /// <summary>
+        /// 全检工序数据主键
+        /// </summary>
+        public Int64 op_data_id { get; set; }
+
+        /// <summary>
+        /// 不良类型
+        /// </summary>
+        public string bad_type { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal bad_qty { get; set; }
+
+        /// <summary>
+        /// 不良率
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal percent_bad_all { get; set; }
+
+        /// <summary>
+        /// 不良占比
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal percent_bad { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 98 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// OQC出货检验记录
+    /// </summary>
+    public class sqe_oqc
+    {
+
+        /// <summary>
+        /// 流水号主键
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 供应商编码
+        /// </summary>
+        public string supp_no { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string item_name { get; set; }
+
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string item_no { get; set; }
+
+        /// <summary>
+        /// 物料版本号
+        /// </summary>
+        public string item_version { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime product_time { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+        public string batch_no { get; set; }
+
+        /// <summary>
+        /// 批次数量
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal batch_qty { get; set; }
+
+        /// <summary>
+        /// 检验人员
+        /// </summary>
+        public string test_person { get; set; }
+
+        /// <summary>
+        /// 抽样标准
+        /// </summary>
+        public string sampling_standard { get; set; }
+
+        /// <summary>
+        /// 抽样数量
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal sampling_number { get; set; }
+
+        /// <summary>
+        /// 最终判定
+        /// </summary>
+        public string test_result { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 67 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc_data.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// OQC出货检验记录的检验标准
+    /// </summary>
+    public class sqe_oqc_data
+    {
+
+        /// <summary>
+        /// 流水号
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 检验主键
+        /// </summary>
+        public Int64 oqc_id { get; set; }
+
+        /// <summary>
+        /// 检验标准主键
+        /// </summary>
+        public Int64 standard_id { get; set; }
+
+        /// <summary>
+        /// 检验序号
+        /// </summary>
+        public string data_no { get; set; }
+
+        /// <summary>
+        /// 检验值
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal? data_value { get; set; }
+
+        /// <summary>
+        /// 检验结果状态
+        /// </summary>
+        public string data_result { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 81 - 0
MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_oqc_standard.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Business.Core.Attributes;
+using System.IO;
+
+namespace Business.StructuredDB.Sqe
+{
+    /// <summary>
+    /// OQC出货检验记录的检验标准
+    /// </summary>
+    public class sqe_oqc_standard
+    {
+
+        /// <summary>
+        /// 流水号
+        /// </summary>
+        public Int64 id { get; set; }
+
+        /// <summary>
+        /// 检验主键
+        /// </summary>
+        public Int64 oqc_id { get; set; }
+
+        /// <summary>
+        /// 检验项目
+        /// </summary>
+        public string standard_no { get; set; }
+
+        /// <summary>
+        /// 标准值
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal standard_value { get; set; }
+
+        /// <summary>
+        /// 上公差
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal delta_up { get; set; }
+
+        /// <summary>
+        /// 下公差
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal delta_down { get; set; }
+
+        /// <summary>
+        /// 上限
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal standard_max { get; set; }
+
+        /// <summary>
+        /// 下限
+        /// </summary>
+        [DecimalPrecision(18, 5)]
+        public decimal standard_min { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime create_date { get; set; }
+
+        /// <summary>
+        /// 创建人员
+        /// </summary>
+        public string create_by { get; set; }
+
+        /// <summary>
+        /// 创建部门
+        /// </summary>
+        public string create_org { get; set; }
+
+        /// <summary>
+        /// 删除标志
+        /// </summary>
+        public int delete_flag { get; set; }
+
+    }
+}

+ 111 - 0
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -515,41 +515,61 @@ namespace Business.EntityFrameworkCore
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
             });
+
             builder.Entity<sqe_cto_process_data>(b =>
             {
                 b.ToTable("sqe_cto_process_data");
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
             });
+
             builder.Entity<sqe_cto_process_standard>(b =>
             {
                 b.ToTable("sqe_cto_process_standard");
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
             });
+
             builder.Entity<sqe_cto_test>(b =>
             {
                 b.ToTable("sqe_cto_test");
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
             });
+
             builder.Entity<sqe_cto_test_data>(b =>
             {
                 b.ToTable("sqe_cto_test_data");
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
             });
+
             builder.Entity<sqe_cto_test_standard>(b =>
             {
                 b.ToTable("sqe_cto_test_standard");
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_file_data>(b =>
+            {
+                b.ToTable("sqe_file_data");
+                b.HasNoKey();
+                //b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
             });
 
             builder.Entity<sqe_file_upload>(b =>
@@ -558,6 +578,97 @@ namespace Business.EntityFrameworkCore
                 b.HasNoKey();
                 b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
                 b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_oqc>(b =>
+            {
+                b.ToTable("sqe_oqc");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_oqc_data>(b =>
+            {
+                b.ToTable("sqe_oqc_data");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_oqc_standard>(b =>
+            {
+                b.ToTable("sqe_oqc_standard");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_fpy>(b =>
+            {
+                b.ToTable("sqe_fpy");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_fpy_data>(b =>
+            {
+                b.ToTable("sqe_fpy_data");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_op>(b =>
+            {
+                b.ToTable("sqe_op");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_op_data>(b =>
+            {
+                b.ToTable("sqe_op_data");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_op_data_detail>(b =>
+            {
+                b.ToTable("sqe_op_data_detail");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_fct>(b =>
+            {
+                b.ToTable("sqe_fct");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
+            });
+
+            builder.Entity<sqe_fct_data>(b =>
+            {
+                b.ToTable("sqe_fct_data");
+                b.HasNoKey();
+                b.Property(b => b.create_date).HasDefaultValue(DateTime.Now);
+                b.ConfigureByConvention();
+
             });
         }
     }

+ 11 - 1
MicroServices/Business/Business.EntityFrameworkCore/EntityFrameworkCore/Sqe/BusinessSqeDbContext.cs

@@ -18,8 +18,18 @@ namespace Business.EntityFrameworkCore
         public DbSet<sqe_cto_test> sqe_cto_test { get; set; }
         public DbSet<sqe_cto_test_data> sqe_cto_test_data { get; set; }
         public DbSet<sqe_cto_test_standard> sqe_cto_test_standard { get; set; }
-        public DbSet<sqe_file_upload> sqe_file_upload { get; set; }
         public DbSet<sqe_file_data> sqe_file_data { get; set; }
+        public DbSet<sqe_file_upload> sqe_file_upload { get; set; }
+        public DbSet<sqe_oqc> sqe_oqc { get; set; }
+        public DbSet<sqe_oqc_data> sqe_oqc_data { get; set; }
+        public DbSet<sqe_oqc_standard> sqe_oqc_standard { get; set; }
+        public DbSet<sqe_fpy> sqe_fpy { get; set; }
+        public DbSet<sqe_fpy_data> sqe_fpy_data { get; set; }
+        public DbSet<sqe_op> sqe_op { get; set; }
+        public DbSet<sqe_op_data> sqe_op_data { get; set; }
+        public DbSet<sqe_op_data_detail> sqe_op_data_detail { get; set; }
+        public DbSet<sqe_fct> sqe_fct { get; set; }
+        public DbSet<sqe_fct_data> sqe_fct_data { get; set; }
 
 
         #endregion SqeÊý¾Ý·ÃÎÊ

+ 34 - 3
MicroServices/Business/Business.HttpApi/Controllers/SqeController.cs

@@ -30,11 +30,42 @@ namespace Business.Controllers
 
 
         [HttpGet]
-        [Route("import_1")]
-        public string Import_1(int file_id)
+        [Route("import_test")]
+        public string Import_test(int file_id)
         {
+            String s = _SqeExcelService.Import_Test_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
+            return s;
+        }
+
+        [HttpGet]
+        [Route("import_process")]
+        public string Import_process(int file_id)
+        {
+            String s = _SqeExcelService.Import_Process_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
+            return s;
+        }
 
-            String s = _SqeExcelService.ImportData_From_Data(28, "测试用户", DateTime.Now, "测试组织");
+        [HttpGet]
+        [Route("import_oqc")]
+        public string Import_oqc(int file_id)
+        {
+            String s = _SqeExcelService.Import_Oqc_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
+            return s;
+        }
+
+        [HttpGet]
+        [Route("import_op")]
+        public string Import_op(int file_id)
+        {
+            String s = _SqeExcelService.Import_Op_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
+            return s;
+        }
+
+        [HttpGet]
+        [Route("import_fpy")]
+        public string Import_fpy(int file_id)
+        {
+            String s = _SqeExcelService.Import_Fpy_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
             return s;
         }
     }

+ 6 - 0
MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -3616,3 +3616,9 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-03T09:16:14.8226167+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-03T09:16:14.8282444+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-03T09:16:14.8303783+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-06-03T10:32:06.6771075+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-06-03T10:32:06.712799+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-06-03T10:32:06.715884+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-03T10:32:06.7174235+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-03T10:32:06.7223+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-03T10:32:06.7239398+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}

部分文件因为文件数量过多而无法显示