diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index bfe6dd0..982c2b3 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide index ae2b11b..2ee01e8 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index 8284d00..e9cdd69 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 7b85379..dc1cb0f 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 8aa7c11..bf54086 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs index ad2e7ab..7fa8b15 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs @@ -232,8 +232,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_jot").ToString()); sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString()); sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_hotjot").ToString()); - sb.AppendFormat(""); - sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString()); + sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString()); + sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString()); + sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString()); + sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString()); sb.Append(""); sb.Append(""); diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true