Commit a6f94e7f by 陶然

优化

parent 232c561f
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
/Src/obj/Debug /Src/obj/Debug
/Src/bin/Debug /Src/bin/Debug
/.vs
...@@ -85,7 +85,7 @@ namespace Njhg.Third.Semir.Entities ...@@ -85,7 +85,7 @@ namespace Njhg.Third.Semir.Entities
if (thirdDetails.IsNullOrEmpty()) return false; if (thirdDetails.IsNullOrEmpty()) return false;
var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid)); var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
if (reports.IsNullOrEmpty()) return false; if (reports.IsNullOrEmpty()) return false;
if (reports.Exists(o => o.Status != (int)ReportStatusType.ReportCollected)) return false; if (reports.Exists(o => o.Status < (int)ReportStatusType.ReportIssue)) return false;
var result_info = new ReportResultInfo(); var result_info = new ReportResultInfo();
result_info.DOC_NO = third.SerialNumber; result_info.DOC_NO = third.SerialNumber;
...@@ -100,7 +100,7 @@ namespace Njhg.Third.Semir.Entities ...@@ -100,7 +100,7 @@ namespace Njhg.Third.Semir.Entities
//if (thirdDetail.ReportKvid == Guid.Empty) continue; //if (thirdDetail.ReportKvid == Guid.Empty) continue;
//var report = reports.FirstOrDefault(o => o.Kvid == thirdDetail.ReportKvid); //var report = reports.FirstOrDefault(o => o.Kvid == thirdDetail.ReportKvid);
//if (report == null) continue; //if (report == null) continue;
if (report.Status != (int)ReportStatusType.ReportCollected) continue; if (report.Status < (int)ReportStatusType.ReportIssue) continue;
var queryReportItems = conn.From<ReportItem>(); var queryReportItems = conn.From<ReportItem>();
queryReportItems.Where(o => o.ReportKvid == report.Kvid); queryReportItems.Where(o => o.ReportKvid == report.Kvid);
var allReportItems = conn.Select(queryReportItems); var allReportItems = conn.Select(queryReportItems);
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<None Include="Resources\南京海关森马质检接口描述.docx" /> <None Include="Resources\南京海关森马质检接口描述.docx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Kivii.K5\Kivii.Biz.Lims.V1.0\Src\Kivii.Biz.Lims.V1.0.csproj"> <ProjectReference Include="..\..\..\Kivii.K5\Kivii.Biz.Lims.V1.0\Src\Kivii.Biz.Lims.V1.0.csproj">
<Project>{c2a2c9b2-e412-4267-8dad-4c37a3fe33e3}</Project> <Project>{c2a2c9b2-e412-4267-8dad-4c37a3fe33e3}</Project>
<Name>Kivii.Biz.Lims.V1.0</Name> <Name>Kivii.Biz.Lims.V1.0</Name>
</ProjectReference> </ProjectReference>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment