From e4a8d7f46e421581a5fd3308268c19df2a796851 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 17 Feb 2025 17:01:36 +0800 Subject: [PATCH] =?UTF-8?q?20250217=20=E8=AE=BE=E5=A4=87=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/BLL.csproj | 1 + SGGL/BLL/Common/Sys_CQMS_DataInTempService.cs | 171 ++++ .../Comprehensive/InspectionEquipment.aspx | 2 +- .../Comprehensive/InspectionEquipment.aspx.cs | 3 +- .../InspectionEquipmentDataInNew.aspx | 186 ++++ .../InspectionEquipmentDataInNew.aspx.cs | 578 ++++++++++++ ...pectionEquipmentDataInNew.aspx.designer.cs | 251 +++++ .../InspectionEquipmentDataInNewEdit.aspx | 81 ++ .../InspectionEquipmentDataInNewEdit.aspx.cs | 277 ++++++ ...ionEquipmentDataInNewEdit.aspx.designer.cs | 215 +++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 17 + SGGL/FineUIPro.Web/res/DataInTable.js | 54 ++ SGGL/Model/Model.cs | 889 +++++++++++++++++- SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 15 files changed, 2698 insertions(+), 31 deletions(-) create mode 100644 SGGL/BLL/Common/Sys_CQMS_DataInTempService.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNew.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentDataInNewEdit.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/res/DataInTable.js diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index de45cb1e..99a5c7bf 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -182,6 +182,7 @@ + diff --git a/SGGL/BLL/Common/Sys_CQMS_DataInTempService.cs b/SGGL/BLL/Common/Sys_CQMS_DataInTempService.cs new file mode 100644 index 00000000..8b1bbef5 --- /dev/null +++ b/SGGL/BLL/Common/Sys_CQMS_DataInTempService.cs @@ -0,0 +1,171 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public class Sys_CQMS_DataInTempService + { /// + /// 根据主键获取导入临时表信息 + /// + /// Id + /// + public static Model.Sys_CQMS_DataInTemp GetDataInTempByTempId(string tempId) + { + return Funs.DB.Sys_CQMS_DataInTemp.FirstOrDefault(x => x.TempId == tempId); + } + + /// + /// 增加导入临时表记录 + /// + /// 委托实体 + public static void AddDataInTemp(Model.Sys_CQMS_DataInTemp dataInTemp) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_CQMS_DataInTemp newDataInTemp = new Model.Sys_CQMS_DataInTemp(); + newDataInTemp.TempId = dataInTemp.TempId; + newDataInTemp.ProjectId = dataInTemp.ProjectId; + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.RowNo = dataInTemp.RowNo; + newDataInTemp.Type = dataInTemp.Type; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + + newDataInTemp.ToopValue = dataInTemp.ToopValue; + db.Sys_CQMS_DataInTemp.InsertOnSubmit(newDataInTemp); + db.SubmitChanges(); + } + + + public static void AddDataInTemp(List dataInTemps) + { + Model.SGGLDB db = Funs.DB; + foreach (var dataInTemp in dataInTemps) + { + Model.Sys_CQMS_DataInTemp newDataInTemp = new Model.Sys_CQMS_DataInTemp(); + newDataInTemp.TempId = dataInTemp.TempId; + newDataInTemp.ProjectId = dataInTemp.ProjectId; + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.RowNo = dataInTemp.RowNo; + newDataInTemp.Type = dataInTemp.Type; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + + newDataInTemp.ToopValue = dataInTemp.ToopValue; + db.Sys_CQMS_DataInTemp.InsertOnSubmit(newDataInTemp); + } + db.SubmitChanges(); + } + + + + /// + /// 修改导入临时表记录 + /// + /// 焊接实体 + public static void UpdateDataInTemp(Model.Sys_CQMS_DataInTemp dataInTemp) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_CQMS_DataInTemp newDataInTemp = db.Sys_CQMS_DataInTemp.FirstOrDefault(e => e.TempId == dataInTemp.TempId); + if (newDataInTemp != null) + { + newDataInTemp.UserId = dataInTemp.UserId; + newDataInTemp.Time = dataInTemp.Time; + newDataInTemp.Value1 = dataInTemp.Value1; + newDataInTemp.Value2 = dataInTemp.Value2; + newDataInTemp.Value3 = dataInTemp.Value3; + newDataInTemp.Value4 = dataInTemp.Value4; + newDataInTemp.Value5 = dataInTemp.Value5; + newDataInTemp.Value6 = dataInTemp.Value6; + newDataInTemp.Value7 = dataInTemp.Value7; + newDataInTemp.Value8 = dataInTemp.Value8; + newDataInTemp.Value9 = dataInTemp.Value9; + newDataInTemp.Value10 = dataInTemp.Value10; + newDataInTemp.Value11 = dataInTemp.Value11; + newDataInTemp.Value12 = dataInTemp.Value12; + newDataInTemp.Value13 = dataInTemp.Value13; + newDataInTemp.Value14 = dataInTemp.Value14; + newDataInTemp.Value15 = dataInTemp.Value15; + newDataInTemp.Value16 = dataInTemp.Value16; + newDataInTemp.Value17 = dataInTemp.Value17; + newDataInTemp.Value18 = dataInTemp.Value18; + newDataInTemp.Value19 = dataInTemp.Value19; + newDataInTemp.Value20 = dataInTemp.Value20; + newDataInTemp.ToopValue = dataInTemp.ToopValue; + newDataInTemp.Type = dataInTemp.Type; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除导入临时表记录 + /// + /// 委托主键 + public static void DeleteDataInTempByDataInTempID(string tempId) + { + Model.SGGLDB db = Funs.DB; + Model.Sys_CQMS_DataInTemp dataInTemp = db.Sys_CQMS_DataInTemp.FirstOrDefault(e => e.TempId == tempId); + if (dataInTemp != null) + { + db.Sys_CQMS_DataInTemp.DeleteOnSubmit(dataInTemp); + db.SubmitChanges(); + } + } + + /// + /// 根据项目用户主键删除导入临时表记录 + /// + /// + /// + public static void DeleteDataInTempByProjectIdUserId(string projectId, string userId, string type) + { + Model.SGGLDB db = Funs.DB; + var dataInTemp = from x in db.Sys_CQMS_DataInTemp where x.ProjectId == projectId && x.UserId == userId && x.Type == type select x; + if (dataInTemp.Count() > 0) + { + db.Sys_CQMS_DataInTemp.DeleteAllOnSubmit(dataInTemp); + db.SubmitChanges(); + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx index 009f38c2..82c49569 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx @@ -131,7 +131,7 @@