Merge branch 'master' of http://git.kivii.org/neoturing/Njhg.Third.Semir.V4.5

Src/Entities/SemirOrderBase.cs

@@ -95,7 +95,7 @@ namespace Njhg.Third.Semir.Entities
             if (thirdDetails.IsNullOrEmpty()) return false;
             var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
             if (reports.IsNullOrEmpty()) return false;
-            if (reports.Exists(o => o.Status < (int)ReportStatusType.ReportIssue)) return false;
+            if (reports.Exists(o => o.Status <= (int)ReportStatusType.ReportIssue)) return false;
 
             var result_info = new ReportResultInfo();
             result_info.DOC_NO = third.SerialNumber;

Src/Extensions/SemirExtension.cs

@@ -225,11 +225,11 @@ namespace Njhg.Third.Semir.Extensions
             var conn = KiviiContext.GetOpenedDbConnection<Report>();
             if (thirds.IsNullOrEmpty())
             {
-                thirds = conn.Select<ThirdReportOrder>(o => o.IsAccepted == false & o.IsOffseted == false & o.IsUploaded == false & o.ThirdType == typeof(SemirOrder).FullName);
+                thirds = conn.Select<ThirdReportOrder>(o => o.IsAccepted == false && o.IsOffseted == false && o.IsUploaded == false && o.ThirdType == typeof(SemirOrder).FullName);
             }
             if (thirds.IsNullOrEmpty()) return;
             var queryReports = conn.From<Report>();
-            queryReports.Where(o => Sql.In(o.BizId, thirds.ConvertAll(p => p.SerialNumber)) & o.Status >= (int)ReportStatusType.ReportIssue).OrderBy(o => o.ReportId);
+            queryReports.Where(o => Sql.In(o.BizId, thirds.ConvertAll(p => p.SerialNumber))).OrderBy(o => o.ReportId);
             var allReports = conn.Select(queryReports);
             if (allReports.IsNullOrEmpty()) return;
 

Src/Jobs/SemirOrderJob.cs

@@ -122,7 +122,7 @@ namespace Njhg.Third.Semir.Jobs
                     TaskContext.Message = "暂无数据处理";
                     return true;
                 }
-                var semirKvids = semirs.ConvertAll(o => o.Kvid);
+                //var semirKvids = semirs.ConvertAll(o => o.Kvid);
 
                 var instance = Activator.CreateInstance(typeof(SemirOrder)) as IEntityIsThirdReportOrder;
                 var successed = 0;
@@ -133,13 +133,36 @@ namespace Njhg.Third.Semir.Jobs
                 //else skip++;
                 //TaskContext.Message = $"待回传订单：{semir.SerialNumber}，包含报告:{semir.ReportIds} , 成功回传：{successed}条，跳过{skip}条。";
                 //return true;
-                foreach (var kvid in semirKvids)
+                foreach (var order in semirs)
                 {
-                    var result = instance.OnUploadThirdReport(kvid);
+                    var thirdDetails = conn.Select<ThirdReportOrderDetail>(o => o.ThirdOrderKvid == order.Kvid);
+                    if (thirdDetails.IsNullOrEmpty())
+                    {
+                        skip++;
+                        continue;
+                    }
+                    var reports = conn.SelectByIds<Report>(thirdDetails.ConvertAll(o => o.ReportKvid));
+                    if (reports.IsNullOrEmpty())
+                    {
+                        skip++;
+                        continue;
+                    }
+                    if (reports.Exists(o => o.Status < (int)ReportStatusType.ReportIssue))
+                    {
+                        skip++;
+                        continue;
+                    }
+                    if (reports.Exists(o => o.TestJudgement == "不合格"))
+                    {
+                        skip++;
+                        continue;
+                    }
+
+                    var result = instance.OnUploadThirdReport(order.Kvid);
                     if (result) successed++;
                     else skip++;
                 }
-                TaskContext.Message = $"合计待回传订单：{semirKvids.Count}条，成功回传：{successed}条，跳过{skip}条。";
+                TaskContext.Message = $"合计待回传订单：{semirs.Count}条，成功回传：{successed}条，跳过{skip}条。";
                 return true;
             }
             catch (Exception ex)
@@ -149,12 +172,12 @@ namespace Njhg.Third.Semir.Jobs
             }
             finally
             {
-                var thread = KiviiContext.NewThread(() =>
-                {
-                    //没有关联报告的 自动执行符合条件的关联
-                    SemirExtension.LinkReports();
-                });
-                thread.Start();
+                //var thread = KiviiContext.NewThread(() =>
+                //{
+                //    //没有关联报告的 自动执行符合条件的关联
+                //    SemirExtension.LinkReports();
+                //});
+                //thread.Start();
             }
         }
 

Src/Njhg.Third.Semir.V4.5.csproj

@@ -32,8 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Kivii.Common.V4.5, Version=5.6.2024.1160, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Kivii.Common.5.6.2024.1160\lib\net45\Kivii.Common.V4.5.dll</HintPath>
+      <HintPath>..\..\..\packages\Kivii.Common.5.6.2024.1160\lib\net45\Kivii.Common.V4.5.dll</HintPath>
     </Reference>
     <Reference Include="Kivii.Core.V4.5, Version=5.6.2023.9000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -67,7 +66,7 @@
     <None Include="Resources\南京海关森马质检接口描述.docx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Kivii.Biz.Lims1.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>
       <Name>Kivii.Biz.Lims.V1.0</Name>
     </ProjectReference>

Src/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.1200")]
-[assembly: AssemblyFileVersion("5.4.2024.1200")]
+[assembly: AssemblyVersion("5.4.2024.2290")]
+[assembly: AssemblyFileVersion("5.4.2024.2290")]