优化

Src/FrmMain.Designer.cs

@@ -602,7 +602,7 @@
             this.Controls.Add(this.plLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmMain";
-            this.Text = "样品入箱客户端 1.4(23.7.80 CP2101)";
+            this.Text = "样品入箱客户端 1.5(23.7.120 CP2101)";
             this.Load += new System.EventHandler(this.FrmMain_Load);
             this.plLeft.ResumeLayout(false);
             this.gbInfo.ResumeLayout(false);

Src/FrmMain.cs

@@ -489,13 +489,13 @@ namespace Kivii.Client.SamplePackages
             try
             {
                 _tmr?.Stop();//先停止定时器，防止重复触发
+                var epc = ReaderInstance.ReadEpc();
+                Thread.Sleep(50);//给下一个写卡让出时间
                 var tid = ReaderInstance.ReadTid();//先读取Tid,即RFID标签的唯一标识
                 if (string.IsNullOrEmpty(tid))//如果没有，那么就是没卡，直接返回
                 {
                     return;
                 }
-                Thread.Sleep(50);//给下一个写卡让出时间
-                var epc = ReaderInstance.ReadEpc();
                 samplePrepackaging(tid, epc);
             }
             catch (Exception ex)

Src/Kivii.Client.SamplePackages.V4.0.csproj

@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>F.ico</ApplicationIcon>
+    <ApplicationIcon>F2.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -105,6 +105,7 @@
     <None Include="Resources\一体机开发包.zip" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="F2.ico" />
     <EmbeddedResource Include="Basic.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>

Src/Properties/AssemblyInfo.cs

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

Src/Requests/RestfulRequests.cs

@@ -25,6 +25,7 @@ namespace Kivii.Samples.Transforms
     public class SampleQuery : IReturn<RestfulQueryResponse<Sample>>
     {
         public Guid PackageKvid { get; set; }
+        public string OrderBy { get; set; } = "BizId";
     }
 
     [Route(Configs.RouteSamplePrePackaging)]