更新优化

.gitignore

@@ -9,3 +9,5 @@
 /Src/.vs/Jst.Client.Report.Download.V4.0/v16/.suo
 /Src/packages/Kivii.Common.5.6.2021.7000/Kivii.Common.5.6.2021.7000.nupkg
 /Src/.vs/Jst.Client.Report.Download.V4.0/v17/.suo
+/Src/.vs/Jst.Client.Report.Download.V4.0/v17
+/Src/.vs/Jst.Client.Report.Download.V4.0/FileContentIndex/d3c711a1-a596-4659-a3ac-7b35a42ef290.vsidx

Src/FrmMain.Designer.cs

@@ -72,6 +72,7 @@ namespace Jst.Report.Download
             this.tbxUrlBase = new System.Windows.Forms.TextBox();
             this.splitter1 = new System.Windows.Forms.Splitter();
             this.gbDownloadConfig = new System.Windows.Forms.GroupBox();
+            this.cbxRenameByDS = new System.Windows.Forms.CheckBox();
             this.cbxPNandSN = new System.Windows.Forms.CheckBox();
             this.cbxPgName = new System.Windows.Forms.CheckBox();
             this.cbxRenameFileByAjt = new System.Windows.Forms.CheckBox();
@@ -96,7 +97,6 @@ namespace Jst.Report.Download
             this.colDealDate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colProductJudgement = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.lblMessage = new System.Windows.Forms.Label();
-            this.cbxRenameByDS = new System.Windows.Forms.CheckBox();
             this.pnlLeft.SuspendLayout();
             this.gbQuery.SuspendLayout();
             this.pnlCommands.SuspendLayout();
@@ -577,6 +577,16 @@ namespace Jst.Report.Download
             this.gbDownloadConfig.TabStop = false;
             this.gbDownloadConfig.Text = "下载操作";
             // 
+            // cbxRenameByDS
+            // 
+            this.cbxRenameByDS.AutoSize = true;
+            this.cbxRenameByDS.Location = new System.Drawing.Point(349, 90);
+            this.cbxRenameByDS.Name = "cbxRenameByDS";
+            this.cbxRenameByDS.Size = new System.Drawing.Size(68, 24);
+            this.cbxRenameByDS.TabIndex = 15;
+            this.cbxRenameByDS.Text = "笛莎";
+            this.cbxRenameByDS.UseVisualStyleBackColor = true;
+            // 
             // cbxPNandSN
             // 
             this.cbxPNandSN.AutoSize = true;
@@ -808,16 +818,6 @@ namespace Jst.Report.Download
             this.lblMessage.TabIndex = 8;
             this.lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // cbxRenameByDS
-            // 
-            this.cbxRenameByDS.AutoSize = true;
-            this.cbxRenameByDS.Location = new System.Drawing.Point(349, 90);
-            this.cbxRenameByDS.Name = "cbxRenameByDS";
-            this.cbxRenameByDS.Size = new System.Drawing.Size(68, 24);
-            this.cbxRenameByDS.TabIndex = 15;
-            this.cbxRenameByDS.Text = "笛莎";
-            this.cbxRenameByDS.UseVisualStyleBackColor = true;
-            // 
             // FrmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -829,7 +829,7 @@ namespace Jst.Report.Download
             this.Controls.Add(this.pnlLeft);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmMain";
-            this.Text = "江苏纺检院电子报告下载客户端V2.05";
+            this.Text = "江苏纺检院电子报告下载客户端V2.06";
             this.Load += new System.EventHandler(this.FrmMain_Load);
             this.pnlLeft.ResumeLayout(false);
             this.gbQuery.ResumeLayout(false);

Src/FrmMain.cs

@@ -370,7 +370,7 @@ namespace Jst.Report.Download
                     if (_renameFileByProductNameAndSN)
                     {
                         string Text6 = result.SampleName.Trim();
-                        string Text7 = result.SampleBatchNumber.Trim();
+                        string Text7 = result.SampleBatchNumber.IsNullOrEmpty() ? "" : result.SampleBatchNumber.Trim();
                         text = $"{result.ReportId} {Text6}{Text7}.pdf";
                     }
                     if (_renameFileByProductName)
@@ -380,7 +380,7 @@ namespace Jst.Report.Download
                     }
                     if (_renameFileByBatchNumber)
                     {
-                        string text2 = result.SampleBatchNumber.Trim();
+                        string text2 = result.SampleBatchNumber.IsNullOrEmpty() ? "" : result.SampleBatchNumber.Trim();
                         if (!text2.IsNullOrEmpty())
                         {
                             text = $"{result.ReportId}({text2}).pdf";
@@ -389,7 +389,7 @@ namespace Jst.Report.Download
                     if (_renameFileByAjt)
                     {
                         string ReportId = result.ReportId.Trim();
-                        string BatchNumber = result.SampleBatchNumber.Trim();
+                        string BatchNumber = result.SampleBatchNumber.IsNullOrEmpty() ? "" : result.SampleBatchNumber.Trim();
                         string ProductName = result.SampleName.Trim();
                         string ProductJudgement = result.TestJudgement.Trim();
                         if (ProductJudgement.IsNullOrEmpty() || ProductJudgement == "/" || ProductJudgement == "\\")
@@ -401,9 +401,9 @@ namespace Jst.Report.Download
                     if (_renameFileByWph)
                     {
                         string SamplingDate = null;
-                        string BatchNumber = result.SampleBatchNumber.Trim();
-                        string ProductBrand = result.SampleBrand.Trim();
-                        string ProductName = result.SampleName.Trim();
+                        string BatchNumber = result.SampleBatchNumber.IsNullOrEmpty()?"": result.SampleBatchNumber.Trim();
+                        string ProductBrand = result.SampleBrand.IsNullOrEmpty() ? "" : result.SampleBrand.Trim(); 
+                        string ProductName = result.SampleName.IsNullOrEmpty() ? "" : result.SampleName.Trim(); 
                         string ProductJudgement = result.TestJudgement.Trim();
                         if (ProductJudgement.IsNullOrEmpty() || ProductJudgement == "/" || ProductJudgement == "\\")
                         {
@@ -421,7 +421,7 @@ namespace Jst.Report.Download
                     }
                     if (_renameFileByDS)
                     {
-                        string BatchNumber = result.SampleBatchNumber.Trim();
+                        string BatchNumber = result.SampleBatchNumber.IsNullOrEmpty() ? "" : result.SampleBatchNumber.Trim();
                         string ProductBrand = result.SampleBrand.Trim();
                         string ProductName = result.SampleName.Trim();
                         string ProductJudgement = result.TestJudgement.Trim();

Src/Properties/AssemblyInfo.cs

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