From ce75af6899c564cec620b6433585283e20120156 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Mon, 25 Nov 2024 09:35:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SUBQHSE_V2024-11-15-xiaj.sql | 24 ++++++++++++++++++ .../版本日志/SUBQHSE_V2024-11-22-xiaj.sql | 13 ++++++++++ .../Excel/DataIn/Instrumentation导入模板.xls | Bin 22016 -> 22016 bytes .../DataIn/Instrumentation导入模板（旧）.xls | Bin 0 -> 22016 bytes .../Excel/DataIn/StaticEquipment导入模板.xls | Bin 20480 -> 20480 bytes .../Transfer/Chart/Systemstatus.aspx.cs | 2 +- .../Transfer/Instrumentation.aspx | 14 +++++----- .../Transfer/InstrumentationDataIn.aspx.cs | 20 +++++++-------- .../Transfer/InstrumentationEdit.aspx | 4 +-- .../Transfer/InstrumentationEdit.aspx.cs | 20 +++++++-------- .../InstrumentationEdit.aspx.designer.cs | 18 ------------- .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 19 +++++++------- .../Transfer/PunchlistFromEdit.aspx | 23 +++++++++-------- .../Transfer/StaticEquipment.aspx | 2 +- .../Transfer/StaticEquipmentEdit.aspx | 2 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 16 files changed, 92 insertions(+), 71 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板（旧）.xls diff --git a/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql new file mode 100644 index 00000000..6390a1e8 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql @@ -0,0 +1,24 @@ + + +--1޸Ĺֶܵ +ALTER TABLE Transfer_Piping ALTER COLUMN TotalFactor decimal(10, 2); +ALTER TABLE Transfer_Piping ALTER COLUMN CompleteFactor decimal(10, 2); +update Transfer_Piping set CompleteProportion='0'where CompleteProportion='' or CompleteProportion is null; +go +ALTER TABLE Transfer_Piping ALTER COLUMN CompleteProportion decimal(10, 2); +go + + + +--3ƽͳƱȺͱ +IF NOT EXISTS(select * from sys.columns where name='Insulation' and [object_id]=object_id(N'Transfer_SystemControl')) +BEGIN + -- + ALTER TABLE Transfer_SystemControl ADD ElectricHeatTracing nvarchar(50) NULL; + --/ + ALTER TABLE Transfer_SystemControl ADD Insulation nvarchar(50) NULL; +END +go + + + diff --git a/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql new file mode 100644 index 00000000..547482e5 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql @@ -0,0 +1,13 @@ + +--ʷβ޸ +update Transfer_PunchlistFrom set IsMatI='Y2' where IsMatI='Y'; +update Transfer_PunchlistFrom set Punch_Type='JWD' where Punch_Type='FWD'; +go + + +update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-CVL05-01-01' where Sub_Sys_No='CVL05-01'; +update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-EL01-00-01' where Sub_Sys_No='EL01-01'; + +go + + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls index b02bca197549aeb23db80099bcd202cc733708be..f44908570ecd74a9d479c8fa59ebe1e1761dde7e 100644 GIT binary patch delta 2072 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 WVX}0ifoenOM-Ty?n<{W=O#cG`QC+$K delta 396 zcmW-d&nv@m7{}kw`s{1O=EvkmYAcsDB|rBgV_!3iZK0?g5sF$P7D=*;n+s3E&B0-% zw0v(|rW_m`9ONMXfFyIn!93H`>-juA@Avb3`g}5{lsTnbQdK#7`;XGE&(sPa&zow8 z?)Y03O^W!(+-}oANh~0RWvmN4s3mwptKefzR~It{m+_)~^)!8WWf~eyVo}TsNTU~b6}YEjaZJYuXd7N;np3g)^Z}xM%;EBj}K-G@ZZ%CNV9K@d&->Mu%h%{P2ki=%sYh(slKA wP5*UXmHv{qV#E9pb{)jiTD3T`#5dunaT^a1=VSWin3c-BvaknUt{*@D1F - - + + @@ -86,28 +86,28 @@ --%> + HeaderTextAlign="Center" Width="120px"> - - + --%> + HeaderTextAlign="Center" Width="120px"> - + diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs index c16ef0e6..0db982b6 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs @@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 10); + AddDatasetToSQL(ds.Tables[0], 8); hdCheckResult.Text = "1"; } catch (Exception exc) @@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 11); + AddDatasetToSQL2(ds.Tables[0], 8); } catch (Exception ex) { @@ -335,21 +335,21 @@ namespace FineUIPro.Web.Transfer //var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim(); var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim(); - var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim(); - var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim(); - var obj4 = model.PipingBlowing = pds.Rows[i][8].ToString().Trim(); - var obj5 = model.Looptest = pds.Rows[i][9].ToString().Trim(); + //var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim(); + //var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim(); + var obj4 = model.PipingBlowing = pds.Rows[i][6].ToString().Trim(); + var obj5 = model.Looptest = pds.Rows[i][7].ToString().Trim(); #region 判断状态 var listObj = new List(); listObj.Add(obj1); - listObj.Add(obj2); - listObj.Add(obj3); + //listObj.Add(obj2); + //listObj.Add(obj3); listObj.Add(obj4); listObj.Add(obj5); //listObj.Add(obj0); //全是NA或Completed 状态是Completed - if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5) + if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { model.FINAL_Status = "Completed"; list.Add(model); @@ -357,7 +357,7 @@ namespace FineUIPro.Web.Transfer } //如果全是NA或Not Start 就是 Not Start - if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5) + if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; list.Add(model); diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx index d7749ed1..ad09ff88 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx @@ -67,7 +67,7 @@ - + <%-- @@ -79,7 +79,7 @@ - + --%> diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs index 8cf84f39..3be30efb 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs @@ -56,8 +56,8 @@ namespace FineUIPro.Web.Transfer txtSubsystem.Text = model.Subsystem; txtTest_Package.Text = model.Test_Package; ddlInstallationCalibration.SelectedValue = model.InstallationCalibration; - ddlPipingPressuretest.SelectedValue = model.PipingPressuretest; - ddlPipingLeak.SelectedValue = model.PipingLeak; + //ddlPipingPressuretest.SelectedValue = model.PipingPressuretest; + //ddlPipingLeak.SelectedValue = model.PipingLeak; ddlPipingBlowing.SelectedValue = model.PipingBlowing; ddlLooptest.SelectedValue = model.Looptest; //ddlCalibration.SelectedValue = model.Calibration; @@ -77,8 +77,8 @@ namespace FineUIPro.Web.Transfer Subsystem = txtSubsystem.Text, Test_Package = txtTest_Package.Text, InstallationCalibration = ddlInstallationCalibration.SelectedValue, - PipingPressuretest = ddlPipingPressuretest.SelectedValue, - PipingLeak = ddlPipingLeak.SelectedValue, + //PipingPressuretest = ddlPipingPressuretest.SelectedValue, + //PipingLeak = ddlPipingLeak.SelectedValue, PipingBlowing = ddlPipingBlowing.SelectedValue, Looptest = ddlLooptest.SelectedValue, //Calibration= ddlCalibration.SelectedValue, @@ -89,19 +89,19 @@ namespace FineUIPro.Web.Transfer #region 判断状态 var listObj = new List(); listObj.Add(model.InstallationCalibration); - listObj.Add(model.PipingPressuretest); - listObj.Add(model.PipingLeak); + //listObj.Add(model.PipingPressuretest); + //listObj.Add(model.PipingLeak); listObj.Add(model.PipingBlowing); listObj.Add(model.Looptest); //listObj.Add(model.Calibration); //全是NA或Completed 状态是Completed - if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5) + if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { model.FINAL_Status = "Completed"; } //如果全是NA或Not Start 就是 Not Start - else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5) + else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3) { model.FINAL_Status = "Not Start"; } @@ -123,8 +123,8 @@ namespace FineUIPro.Web.Transfer newModel.Subsystem = txtSubsystem.Text; newModel.Test_Package = txtTest_Package.Text; newModel.InstallationCalibration = ddlInstallationCalibration.SelectedValue; - newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue; - newModel.PipingLeak = ddlPipingLeak.SelectedValue; + //newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue; + //newModel.PipingLeak = ddlPipingLeak.SelectedValue; newModel.PipingBlowing = ddlPipingBlowing.SelectedValue; newModel.Looptest = ddlLooptest.SelectedValue; //newModel.Calibration = ddlCalibration.SelectedValue; diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs index 2f26b40a..010b72ff 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs @@ -95,24 +95,6 @@ namespace FineUIPro.Web.Transfer /// protected global::FineUIPro.DropDownList ddlInstallationCalibration; - /// - /// ddlPipingPressuretest 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList ddlPipingPressuretest; - - /// - /// ddlPipingLeak 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList ddlPipingLeak; - /// /// ddlPipingBlowing 控件。 /// diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx index ff2cc19f..fc6e24b4 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx @@ -46,14 +46,15 @@ - + - + <%----%> + <%----%> - + @@ -154,7 +155,7 @@ - + @@ -178,7 +179,7 @@ - + @@ -197,7 +198,7 @@ <%----%> - + @@ -223,9 +224,9 @@ - + - + @@ -254,7 +255,7 @@ diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx index baa61888..df04f1b5 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + <%----%> @@ -60,10 +60,11 @@ - + - + <%----%> + @@ -73,22 +74,22 @@ - + - + - + - + @@ -134,7 +135,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx index 787bac49..ad5e4d9a 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx @@ -90,7 +90,7 @@ - diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx index 8ead1e0a..868e9377 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx @@ -53,7 +53,7 @@ - + diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index df2b89c2..71396b97 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true