版本升级

Src/App.config

 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <connectionStrings>
+  
+<connectionStrings>
     <!--<add name="Database" providerName="Sqlite" connectionString="$ROOT\AppData\primary.sqlite"/>-->
-  </connectionStrings>
-</configuration>
+  </connectionStrings></configuration>
\ No newline at end of file
\ No newline at end of file

Src/FrmMain.cs

@@ -282,33 +282,45 @@ namespace Kivii.Client.SamplePackages
                 bool sampleBizIdWithSuffix = false;
                 if (typeEx.ToLower() == "j") typeJ = true;
 
-                if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("a")) packageNameIsA = true;
+                var packageName = _currentPackage.Name.ToLower();
+                //if (.StartsWithIgnoreCase("a")) packageNameIsA = true;
                 sampleBizIdWithSuffix = Regex.IsMatch(bizid.ToLower(), "[a-zA-Z]$", RegexOptions.IgnoreCase);
-                if (typeJ)
+                if (typeJ)//监督号
                 {
-                    if (_currentPackage.Name.ToLower().StartsWithIgnoreCase("c")) samplePackaging(record);
+                    if (packageName.StartsWithIgnoreCase("c")) samplePackaging(record);
                     else
                     {
                         MessageBox.Show("此报告号为监督样，只能入C箱!", "样品入箱");
                         return;
                     }
                 }
-                else if (packageNameIsA)
+                else//普通业务号
                 {
-                    if(sampleBizIdWithSuffix) samplePackaging(record);
-                    else
+                    if (sampleBizIdWithSuffix)//有后缀入A框
                     {
-                        MessageBox.Show("此报告号无后缀，不可入A箱!", "样品入箱");
-                        return;
+                        if (packageName.StartsWithIgnoreCase("a"))
+                        {
+                            samplePackaging(record);
+                        }
+                        else
+                        {
+                            MessageBox.Show("此报告号有后缀，只能入A箱!", "样品入箱");
+                            return;
+                        }
+
                     }
-                }
-                else
-                {
-                    if(!sampleBizIdWithSuffix) samplePackaging(record);
                     else
                     {
-                        MessageBox.Show("此报告号有后缀，不可入B箱!", "样品入箱");
-                        return;
+                        if (packageName.StartsWithIgnoreCase("b"))
+                        {
+                            samplePackaging(record);
+                        }
+                        else
+                        {
+                            MessageBox.Show("此报告号无后缀，只能入B箱!", "样品入箱");
+                            return;
+                        }
+
                     }
                 }
                 

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

@@ -38,17 +38,17 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Kivii.Common.V4.0, Version=5.6.2023.4000, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Kivii.Common.5.6.2023.4000\lib\net40\Kivii.Common.V4.0.dll</HintPath>
+    <Reference Include="Kivii.Common.V4.0, Version=5.6.2024.11000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Kivii.Common.5.6.2024.11000\lib\net40\Kivii.Common.V4.0.dll</HintPath>
     </Reference>
-    <Reference Include="Kivii.Core.V4.0, Version=5.6.2023.4140, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Kivii.Core.5.6.2023.4140\lib\net40\Kivii.Core.V4.0.dll</HintPath>
+    <Reference Include="Kivii.Core.V4.0, Version=5.6.2024.11000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Kivii.Core.5.6.2024.11000\lib\net40\Kivii.Core.V4.0.dll</HintPath>
     </Reference>
-    <Reference Include="Kivii.Linq.Sqlite.V4.0, Version=5.6.2023.3000, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Kivii.Linq.Sqlite.5.6.2023.3000\lib\net40\Kivii.Linq.Sqlite.V4.0.dll</HintPath>
+    <Reference Include="Kivii.Linq.Sqlite.V4.0, Version=5.6.2024.11000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Kivii.Linq.Sqlite.5.6.2024.11000\lib\net40\Kivii.Linq.Sqlite.V4.0.dll</HintPath>
     </Reference>
-    <Reference Include="Kivii.Linq.V4.0, Version=5.6.2023.4200, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Kivii.Linq.5.6.2023.4200\lib\net40\Kivii.Linq.V4.0.dll</HintPath>
+    <Reference Include="Kivii.Linq.V4.0, Version=5.6.2024.11000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Kivii.Linq.5.6.2024.11000\lib\net40\Kivii.Linq.V4.0.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Src/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Kivii.Common" version="5.6.2023.4000" targetFramework="net40" />
-  <package id="Kivii.Core" version="5.6.2023.4140" targetFramework="net40" />
-  <package id="Kivii.Linq" version="5.6.2023.4200" targetFramework="net40" />
-  <package id="Kivii.Linq.Sqlite" version="5.6.2023.3000" targetFramework="net40" />
+  <package id="Kivii.Common" version="5.6.2024.11000" targetFramework="net40" />
+  <package id="Kivii.Core" version="5.6.2024.11000" targetFramework="net40" />
+  <package id="Kivii.Linq" version="5.6.2024.11000" targetFramework="net40" />
+  <package id="Kivii.Linq.Sqlite" version="5.6.2024.11000" targetFramework="net40" />
 </packages>
\ No newline at end of file