sqe

MicroServices/Business/Business.Application.Contracts/Sqe/ISqeExcelService.cs

@@ -58,5 +58,8 @@ namespace Business.VSM
         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);
+
+        public string Import_Fct_From_Data(String data, string create_by, DateTime create_date, string create_org);
+
     }
 }

MicroServices/Business/Business.Application/SqeManagement/SqeExcelService.cs

@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using Business.EntityFrameworkCore.SqlRepositories;
 using Business.StructuredDB.Sqe;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.UserModel;
-using NPOI.XSSF.UserModel;
+using Newtonsoft.Json.Linq;
 using Volo.Abp.Application.Services;
 
 namespace Business.VSM
@@ -3139,5 +3136,92 @@ namespace Business.VSM
         #endregion OQC
 
 
+        #region Fct
+
+        /// <summary>
+        /// 将字符串插入到数据库
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="create_by"></param>
+        /// <param name="create_date"></param>
+        /// <param name="create_org"></param>
+        /// <returns></returns>
+        public string Import_Fct_From_Data(String data, string create_by, DateTime create_date, string create_org)
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            sqe_fct model = new sqe_fct();
+            List<sqe_fct_data> modelList = new List<sqe_fct_data>();
+            DateTime timeValue;
+            decimal realValuel;
+
+            try
+            {
+                JObject json = JObject.Parse(data);
+                model.SpID = json["SpID"].ToString();
+                model.WLID = json["WLID"].ToString();
+                model.WPID = json["WPID"].ToString();
+                model.op_side = json["OpSide"].ToString();
+                model.LineID = json["LineID"].ToString();
+                model.OpID = json["OpID"].ToString();
+                model.bar_code = json["BarCode"].ToString();
+                model.WONO = json["WONO"].ToString();
+                model.program = json["Program"].ToString();
+                model.pro_version = json["ProVersion"].ToString();
+                model.test_result = json["testResult"].ToString();
+                model.msg = json["Msg"].ToString();
+                model.create_by = create_by;
+                model.create_date = create_date;
+                model.create_org = create_org;
+
+                JArray array = JArray.Parse(json["testData"].ToString());
+
+                //将每一个检测标准的值从记录行中取出来
+                for (int j = 0; array != null && j < array.Count; j++)
+                {
+                    sqe_fct_data data1 = new sqe_fct_data();
+                    data1.name = array[j]["Name"].ToString();
+                    data1.unit = array[j]["Unit"].ToString();
+                    data1.lower = decimal.Parse(array[j]["Lower"].ToString());
+                    data1.upper = decimal.Parse(array[j]["Upper"].ToString());
+                    data1.actual = decimal.Parse(array[j]["Actual"].ToString());
+                    data1.result = array[j]["result"].ToString();
+                    data1.start_time = DateTime.Parse(array[j]["StartTime"].ToString());
+                    data1.end_time = DateTime.Parse(array[j]["endTime"].ToString());
+                    data1.detial = array[j]["Detial"].ToString();
+                    data1.create_by = create_by;
+                    data1.create_date = create_date;
+                    data1.create_org = create_org;
+                    modelList.Add(data1);
+                }
+            }
+            catch (Exception ex)
+            {
+                stringBuilder.Append(ex.ToString());
+                WLLog.Error("Fct上传数据解析_原始数据转换到对象实体的问题：", ex);
+            }
+            try
+            {
+                _sqe_fct.BeginTransaction();
+                _sqe_fct.Insert(model);
+                foreach (var item in modelList)
+                {
+                    item.fct_id = model.id;
+                }
+                _sqe_fct_data.BeginTransaction();
+                _sqe_fct_data.Insert(modelList);
+                _sqe_fct_data.CommitTransaction();
+                _sqe_fct.CommitTransaction();
+            }
+            catch (Exception ex)
+            {
+                _sqe_fct_data.Rollback();
+                _sqe_fct.Rollback();
+                stringBuilder.Append(ex.ToString());
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        #endregion Fct
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct.cs

@@ -37,5 +37,65 @@ namespace Business.StructuredDB.Sqe
         /// </summary>
         public int delete_flag { get; set; }
 
+        /// <summary>
+        /// 供货商名称
+        /// </summary>
+        public string SpID { get; set; }
+
+        /// <summary>
+        /// 工位ID
+        /// </summary>
+        public string WLID { get; set; }
+
+        /// <summary>
+        /// 工序ID
+        /// </summary>
+        public string WPID { get; set; }
+
+        /// <summary>
+        /// 作业面别
+        /// </summary>
+        public string op_side { get; set; }
+
+        /// <summary>
+        /// 线别名称
+        /// </summary>
+        public string LineID { get; set; }
+
+        /// <summary>
+        /// 操作账号
+        /// </summary>
+        public string OpID { get; set; }
+
+        /// <summary>
+        /// 产品条码
+        /// </summary>
+        public string bar_code { get; set; }
+
+        /// <summary>
+        /// 排产工单
+        /// </summary>
+        public string WONO { get; set; }
+
+        /// <summary>
+        /// 设备程序名称
+        /// </summary>
+        public string program { get; set; }
+
+        /// <summary>
+        /// 设备程序版本
+        /// </summary>
+        public string pro_version { get; set; }
+
+        /// <summary>
+        /// 测试结果
+        /// </summary>
+        public string test_result { get; set; }
+
+        /// <summary>
+        /// 其它信息
+        /// </summary>
+        public string msg { get; set; }
+
     }
 }

MicroServices/Business/Business.Domain/StructuredDB/Sqe/sqe_fct_data.cs

@@ -23,35 +23,50 @@ namespace Business.StructuredDB.Sqe
         public Int64 fct_id { get; set; }
 
         /// <summary>
-        /// 测试时间
+        /// 测试项名称
         /// </summary>
-        public DateTime test_time { get; set; }
+        public string name { get; set; }
 
         /// <summary>
-        /// 物料号
+        /// 测试项值单位
         /// </summary>
-        public string item_no { get; set; }
+        public string unit { get; set; }
 
         /// <summary>
-        /// 物料名称
+        /// 测试项值下限
         /// </summary>
-        public string item_name { get; set; }
+        public decimal lower { get; set; }
 
         /// <summary>
-        /// 批次号
+        /// 测试项值上限
         /// </summary>
-        public string batch_no { get; set; }
+        public decimal upper { get; set; }
 
         /// <summary>
-        /// 数量
+        /// 实际测试项值
         /// </summary>
         [DecimalPrecision(18, 5)]
-        public decimal qty_fct { get; set; }
+        public decimal actual { get; set; }
 
         /// <summary>
-        /// 检测结果
+        /// 测试项结果
         /// </summary>
-        public string test_result { get; set; }
+        public string result { get; set; }
+
+        /// <summary>
+        /// 测试项开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+
+        /// <summary>
+        /// 测试项结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+
+        /// <summary>
+        /// 测试项描述说明
+        /// </summary>
+        public string detial { get; set; }
 
         /// <summary>
         /// 创建日期

MicroServices/Business/Business.HttpApi/Controllers/SqeController.cs

@@ -2,6 +2,7 @@
 using Business.VSM;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NLog.Fluent;
 using System;
 using System.Collections.Generic;
@@ -68,5 +69,24 @@ namespace Business.Controllers
             String s = _SqeExcelService.Import_Fpy_From_Data(file_id, "测试用户", DateTime.Now, "测试组织");
             return s;
         }
+
+        [HttpGet]
+        [Route("UploadProductionTestData")]
+        public string Import_fct(String data)
+        {
+            String s = _SqeExcelService.Import_Fct_From_Data(data, "测试用户", DateTime.Now, "测试组织");
+            JObject json = new JObject();
+            if (s == null || s.Length == 0)
+            {
+                json["resultCode"] = "OK";
+                json["resultMessage"] = "成功";
+            }
+            else
+            {
+                json["resultCode"] = "NG";
+                json["resultMessage"] = s;
+            }
+            return json.ToString();
+        }
     }
 }

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -3820,3 +3820,9 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-13T15:22:29.101442+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-13T15:22:29.1064508+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-13T15:22:29.1089293+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-06-16T09:19:27.695516+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-06-16T09:19:27.7353236+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-06-16T09:19:27.7380275+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-16T09:19:27.7396623+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-16T09:19:27.7436615+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-16T09:19:27.7453849+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}