diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs index b4eec22..9b0d3e3 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs @@ -490,10 +490,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage { Model.HJGL_BO_Batch batch = BLL.HJGL_BO_BatchService.GetBatchById(this.BatchId); this.btnDelete.Hidden = true; + Model.SGGLDB db = Funs.DB; if (batch != null) { - var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail - join y in Funs.DB.HJGL_PW_IsoInfo on x.ISO_ID equals y.ISO_ID + var isoList = (from x in db.HJGL_BO_BatchDetail + join y in db.HJGL_PW_IsoInfo on x.ISO_ID equals y.ISO_ID where x.BatchId == this.BatchId select new { x.ISO_ID, y.ISO_IsoNo }).Distinct(); this.drpIsoNo.Items.Clear(); @@ -509,10 +510,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage else { drpWelder.Items.Clear(); - var welderList = (from x in Funs.DB.HJGL_BO_BatchDetail - join y in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID - join z in Funs.DB.HJGL_BS_Welder on y.JOT_CellWelder equals z.WED_ID - join a in Funs.DB.HJGL_BS_Welder on y.JOT_FloorWelder equals a.WED_ID + var welderList = (from x in db.HJGL_BO_BatchDetail + join y in db.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID + join z in db.HJGL_BS_Welder on y.JOT_CellWelder equals z.WED_ID + join a in db.HJGL_BS_Welder on y.JOT_FloorWelder equals a.WED_ID where x.BatchId == this.BatchId select new { WedId = y.JOT_CellWelder + "," + y.JOT_FloorWelder, WedCode = z.WED_Code != a.WED_Code ? (z.WED_Code + "/" + a.WED_Code) : z.WED_Code }).Distinct().ToList(); welderList = welderList.Distinct().ToList(); @@ -1250,6 +1251,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value); if (batchDetail != null) { + Model.SGGLDB db = Funs.DB; var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId); if (!string.IsNullOrEmpty(batchDetail.NDT)) { @@ -1282,7 +1284,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } //热处理合格 - var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + var hotPass = db.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); if (hotPass != null) { if (hotPass.IsOK == true) @@ -1291,7 +1293,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } //硬度合格 - var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); + var hardPass = db.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId); if (hardPass != null) { if (hardPass.IsOK == true) @@ -1300,14 +1302,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } //是否热处理 - var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null); - if (hotProessTrustItem != null) + var hasHotProessTrustItem = db.HJGL_View_CH_HotProessTrustItem.Any(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null); + if (hasHotProessTrustItem ==true) { cbHotTrust.Checked = true; } //硬度委托 - var hotHard = Funs.DB.HJGL_CH_HardTestReportItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID); - if (hotHard != null) + var hasHotHard = db.HJGL_CH_HardTestReportItem.Any(x => x.JOT_ID == batchDetail.JOT_ID); + if (hasHotHard == true) { cbHotHard.Checked = true; } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 5c46a5b..e233efb 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index c97a2ac..80f6370 100644 --- a/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -79,13 +79,13 @@ 09/10/2013 16:29:20 - 07/25/2025 18:18:16 + 09/01/2025 17:47:50 - 07/03/2024 11:01:05 + 07/28/2025 20:15:00 - 07/25/2025 18:18:16 + 09/01/2025 17:47:50 12/17/2020 21:32:28 @@ -115,13 +115,16 @@ 07/25/2012 11:48:56 - 07/25/2025 18:18:15 + 09/01/2025 17:47:50 - 07/25/2025 18:18:15 + 09/01/2025 17:47:50 - 02/18/2018 09:44:54 + 03/17/2021 20:03:36 + + + 11/27/2018 17:59:08 10/23/2021 01:07:54 @@ -316,10 +319,10 @@ 02/01/2018 12:20:56 - 07/25/2025 18:18:17 + 09/01/2025 17:47:51 - 07/25/2025 18:18:17 + 09/01/2025 17:47:51 01/23/2014 13:57:34 @@ -445,7 +448,7 @@ 07/03/2024 11:01:07 - 07/25/2025 18:19:02 + 09/01/2025 17:48:01 \ No newline at end of file diff --git a/HJGL_DS/WebAPI/WebAPI.csproj b/HJGL_DS/WebAPI/WebAPI.csproj index fd79a37..f0a6b13 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj +++ b/HJGL_DS/WebAPI/WebAPI.csproj @@ -46,8 +46,9 @@ - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + False + ..\..\..\..\五环\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\bin\Newtonsoft.Json.dll