From a7e96dd0729a74e89e1f62beb0b3fee5ad5d888f Mon Sep 17 00:00:00 2001
From: qianjiawei <1184704771@qq.com>
Date: Mon, 21 Aug 2023 13:46:21 +0800
Subject: [PATCH] 1

---
 .../Tnb.ProductionMgr/PrdMoTaskService.cs     |  2 +-
 QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs    |  2 +-
 QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs     |  1 -
 QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs     |  2 +-
 QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs       | 12 +++++++++
 QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs       |  2 +-
 .../Entity/{QcSpcData.cs => QcSpcConfig.cs}   |  6 ++---
 .../IQcCheckItemService.cs                    |  2 +-
 .../IQcCheckPlanService.cs                    |  1 -
 .../IQcCheckTaskService.cs                    |  2 +-
 .../IQcCheckTypeService.cs                    |  1 -
 QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs   | 25 +++++++++++++++++++
 QcMgr/Tnb.QcMgr/QcCheckItemService.cs         |  1 -
 QcMgr/Tnb.QcMgr/QcCheckPlanService.cs         |  2 +-
 QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs   |  1 -
 QcMgr/Tnb.QcMgr/QcCheckTaskService.cs         |  2 +-
 16 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs
 rename QcMgr/Tnb.QcMgr.Entities/Entity/{QcSpcData.cs => QcSpcConfig.cs} (87%)
 create mode 100644 QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index ab5ad11d..d7d81073 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -45,7 +45,7 @@ using Tnb.BasicData.Entities.Dto;
 using NPOI.SS.Formula.Functions;
 using Tnb.PerMgr.Entities;
 using Tnb.QcMgr.Interfaces;
-using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Entities;
 using Tnb.QcMgr.Entities.Enums;
 
 // using Tnb.PerMgr.Entities;
diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs
index 8af6d628..c6c9b706 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckItems.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tnb.QcMgr.Entities.Dto
+namespace Tnb.QcMgr.Entities
 {
     public class CheckItemsInput
     {
diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs
index 08231e28..7849ddde 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckPlan.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tnb.QcMgr.Entities.Dto;
 
 namespace Tnb.QcMgr.Entities
 {
diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
index cbe7eed4..acffee6a 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Tnb.QcMgr.Entities.Dto
+namespace Tnb.QcMgr.Entities
 {
     public class QcCheckExecHOut
     {
diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs
new file mode 100644
index 00000000..705cfb5a
--- /dev/null
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/SpcData.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.QcMgr.Entities
+{
+    public class SpcDataInput
+    {
+    }
+}
diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
index c58ec94c..42983040 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Dto/Trigger.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using NPOI.SS.Formula.PTG;
 using Tnb.QcMgr.Entities.Enums;
 
-namespace Tnb.QcMgr.Entities.Dto
+namespace Tnb.QcMgr.Entities
 {
     public class TriggerPlan
     {
diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcData.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs
similarity index 87%
rename from QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcData.cs
rename to QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs
index 62284173..9312eb96 100644
--- a/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcData.cs
+++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcSpcConfig.cs
@@ -13,10 +13,10 @@ namespace Tnb.QcMgr.Entities
     /// <summary>
     /// spc控制图系数
     /// </summary>
-    [SugarTable("qc_spc_data")]
-    public partial class QcSpcData : BaseEntity<string>
+    [SugarTable("qc_spc_config")]
+    public partial class QcSpcConfig : BaseEntity<string>
     {
-        public QcSpcData()
+        public QcSpcConfig()
         {
             id = SnowflakeIdHelper.NextId();
         }
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs
index 651f47e5..3f2544ec 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckItemService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Entities;
 
 namespace Tnb.QcMgr.Interfaces
 {
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
index 2192f330..c48775a2 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckPlanService.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
 
 namespace Tnb.QcMgr.Interfaces
 {
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs
index 808b10f6..5eb82b69 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTaskService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Entities;
 
 namespace Tnb.QcMgr.Interfaces
 {
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs
index 1c373810..75c5ae9b 100644
--- a/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcCheckTypeService.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
 
 namespace Tnb.QcMgr.Interfaces
 {
diff --git a/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs b/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs
new file mode 100644
index 00000000..1d6b2afb
--- /dev/null
+++ b/QcMgr/Tnb.QcMgr.Interfaces/IQcSpcService.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.QcMgr.Entities;
+
+namespace Tnb.QcMgr.Interfaces
+{
+    public interface IQcSpcService
+    {
+        /// <summary>
+        /// 获取spcd数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetSpcItems(string id);
+
+        /// <summary>
+        /// 保存spcd数据
+        /// </summary>
+        /// <returns></returns>
+        public Task SaveData(SpcDataInput SpcDataInput);
+    }
+}
diff --git a/QcMgr/Tnb.QcMgr/QcCheckItemService.cs b/QcMgr/Tnb.QcMgr/QcCheckItemService.cs
index df3acbe1..fea60fdb 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckItemService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckItemService.cs
@@ -22,7 +22,6 @@ using NPOI.Util;
 using SqlSugar;
 using Tnb.Common;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
 using Tnb.QcMgr.Interfaces;
 
 namespace Tnb.QcMgr
diff --git a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
index a9f95453..15f413e1 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
@@ -25,7 +25,7 @@ using Newtonsoft.Json;
 using SqlSugar;
 using Tnb.ProductionMgr.Entities;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Entities;
 using Tnb.QcMgr.Entities.Entity;
 using Tnb.QcMgr.Entities.Enums;
 using Tnb.QcMgr.Interfaces;
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
index 21c4a099..f33ee000 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskResultService.cs
@@ -17,7 +17,6 @@ using Newtonsoft.Json;
 using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
 
 namespace Tnb.QcMgr
 {    /// <summary>
diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
index 7d57caca..431fd37d 100644
--- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
+++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs
@@ -27,7 +27,7 @@ using Tnb.EquipMgr.Entities;
 using Tnb.ProductionMgr.Entities.Dto;
 using Tnb.ProductionMgr.Entities;
 using Tnb.QcMgr.Entities;
-using Tnb.QcMgr.Entities.Dto;
+using Tnb.QcMgr.Entities;
 using Tnb.QcMgr.Entities.Entity;
 using Tnb.QcMgr.Interfaces;
 using JNPF.Common.Extension;