lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-04-11 15:53:21 +08:00
parent baef36874f
commit 9a2ba1af64
4 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+27 -8
View File
@@ -69,14 +69,6 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath> <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
@@ -851,6 +843,33 @@
<WCFMetadataStorage Include="Service References\OAWebService\" /> <WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE"> <COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid> <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor> <VersionMajor>5</VersionMajor>
SGGL/BLL/CQMS/PersonManage/CQMS_TestPlanDetailService.cs
+3 -1
View File
@@ -79,7 +79,8 @@ namespace BLL
/// <param name="WPQ"></param> /// <param name="WPQ"></param>
public static void UpdateTestPlanDetail(Model.Welder_TestPlanDetail TestPlanDetail) public static void UpdateTestPlanDetail(Model.Welder_TestPlanDetail TestPlanDetail)
{ {
Model.SGGLDB db = Funs.DB; using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.Welder_TestPlanDetail newTestPlanDetail = db.Welder_TestPlanDetail.FirstOrDefault(e => e.TestPlanDetailId == TestPlanDetail.TestPlanDetailId); Model.Welder_TestPlanDetail newTestPlanDetail = db.Welder_TestPlanDetail.FirstOrDefault(e => e.TestPlanDetailId == TestPlanDetail.TestPlanDetailId);
if (newTestPlanDetail != null) if (newTestPlanDetail != null)
{ {
@@ -94,6 +95,7 @@ namespace BLL
db.SubmitChanges(); db.SubmitChanges();
} }
} }
}
/// <summary> /// <summary>
/// 根据焊工考试计划id删除对应的所有焊工考试计划明细 /// 根据焊工考试计划id删除对应的所有焊工考试计划明细
SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs
+16 -2
View File
@@ -251,13 +251,27 @@ namespace FineUIPro.Web.CQMS.PersonManage
{ {
detail.CheckMan = person.PersonId; 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); var unit = units.FirstOrDefault(x => x.UnitName == CheckUnit);
if (unit != null) if (unit != null)
{ {
detail.CheckUnit = unit.UnitId; detail.CheckUnit = unit.UnitId;
} }
detail.State = State == "合格" ? true : false; if (State == "合格")
{
detail.State = true;
}
else if (State == "不合格")
{
detail.State = false;
}
details.Add(detail); details.Add(detail);
} }
return details; return details;
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+27 -8
View File
@@ -107,14 +107,6 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath> <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
@@ -14453,6 +14445,33 @@
<WCFMetadata Include="Service References\" /> <WCFMetadata Include="Service References\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE"> <COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid> <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor> <VersionMajor>5</VersionMajor>