diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 19f457de..aefffb1c 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -69,14 +69,6 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll - False - - - ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll - False - False @@ -851,6 +843,33 @@ + + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} + 2 + 4 + 0 + primary + False + True + + + {00020813-0000-0000-C000-000000000046} + 1 + 6 + 0 + primary + False + True + + + {00020905-0000-0000-C000-000000000046} + 8 + 4 + 0 + primary + False + False + {0002E157-0000-0000-C000-000000000046} 5 diff --git a/SGGL/BLL/CQMS/PersonManage/CQMS_TestPlanDetailService.cs b/SGGL/BLL/CQMS/PersonManage/CQMS_TestPlanDetailService.cs index 5a2dddfa..f488bb01 100644 --- a/SGGL/BLL/CQMS/PersonManage/CQMS_TestPlanDetailService.cs +++ b/SGGL/BLL/CQMS/PersonManage/CQMS_TestPlanDetailService.cs @@ -79,19 +79,21 @@ namespace BLL /// public static void UpdateTestPlanDetail(Model.Welder_TestPlanDetail TestPlanDetail) { - Model.SGGLDB db = Funs.DB; - Model.Welder_TestPlanDetail newTestPlanDetail = db.Welder_TestPlanDetail.FirstOrDefault(e => e.TestPlanDetailId == TestPlanDetail.TestPlanDetailId); - if (newTestPlanDetail != null) + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - newTestPlanDetail.PersonId = TestPlanDetail.PersonId; - newTestPlanDetail.QualifiedItem = TestPlanDetail.QualifiedItem; - newTestPlanDetail.TestItem = TestPlanDetail.TestItem; - newTestPlanDetail.IsAppearanceOK = TestPlanDetail.IsAppearanceOK; - newTestPlanDetail.CheckMan = TestPlanDetail.CheckMan; - newTestPlanDetail.NDTResult = TestPlanDetail.NDTResult; - newTestPlanDetail.CheckUnit = TestPlanDetail.CheckUnit; - newTestPlanDetail.State = TestPlanDetail.State; - db.SubmitChanges(); + Model.Welder_TestPlanDetail newTestPlanDetail = db.Welder_TestPlanDetail.FirstOrDefault(e => e.TestPlanDetailId == TestPlanDetail.TestPlanDetailId); + if (newTestPlanDetail != null) + { + newTestPlanDetail.PersonId = TestPlanDetail.PersonId; + newTestPlanDetail.QualifiedItem = TestPlanDetail.QualifiedItem; + newTestPlanDetail.TestItem = TestPlanDetail.TestItem; + newTestPlanDetail.IsAppearanceOK = TestPlanDetail.IsAppearanceOK; + newTestPlanDetail.CheckMan = TestPlanDetail.CheckMan; + newTestPlanDetail.NDTResult = TestPlanDetail.NDTResult; + newTestPlanDetail.CheckUnit = TestPlanDetail.CheckUnit; + newTestPlanDetail.State = TestPlanDetail.State; + db.SubmitChanges(); + } } } diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs index cb5fe0d1..410a16cd 100644 --- a/SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs @@ -251,13 +251,27 @@ namespace FineUIPro.Web.CQMS.PersonManage { detail.CheckMan = person.PersonId; } - detail.NDTResult = NDTResult == "合格" ? true : false; + if (NDTResult == "合格") + { + detail.NDTResult = true; + } + else if (NDTResult == "不合格") + { + detail.NDTResult = false; + } var unit = units.FirstOrDefault(x => x.UnitName == CheckUnit); if (unit != null) { detail.CheckUnit = unit.UnitId; } - detail.State = State == "合格" ? true : false; + if (State == "合格") + { + detail.State = true; + } + else if (State == "不合格") + { + detail.State = false; + } details.Add(detail); } return details; diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 1b0eb55c..519e83e8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -107,14 +107,6 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll - - ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll - False - - - ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll - False - False @@ -14453,6 +14445,33 @@ + + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} + 2 + 4 + 0 + primary + False + True + + + {00020813-0000-0000-C000-000000000046} + 1 + 6 + 0 + primary + False + True + + + {00020905-0000-0000-C000-000000000046} + 8 + 4 + 0 + primary + False + True + {0002E157-0000-0000-C000-000000000046} 5