From 423fb3d4f322813bb28886c71e633c93670d38cc Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Mon, 12 Oct 2026 13:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AF=BC=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BBBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WXUserCollectAuthProdListForm.cs          | 80 +++++++++++--------
 1 file changed, 47 insertions(+), 33 deletions(-)

diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
index 462ac5d..0736557 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs
@@ -525,7 +525,7 @@ namespace TemuKJD.WXForms.ProductForms
 				}
 
 				if (isNotCount)
-					data += "&is_not_count=true";
+					data += "&is_not_count=true"; 
 			}));
 			var html = GetHtml.PostUtf8(url, data);
 			if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -1205,7 +1205,7 @@ namespace TemuKJD.WXForms.ProductForms
 			bool isCollectAuthorityUser = true;
 			Get1688ProductForm.Out1688ProductImport(isCollectAuthorityUser, this.statusBar, this.pbLoading, OutProdSaveDbCallBack);
 		}
-		private void bt_import_wx_Click(object sender, EventArgs e)
+		private async void bt_import_wx_Click(object sender, EventArgs e)
 		{
 			OpenFileDialog openFileDialog = new OpenFileDialog();
 			openFileDialog.Multiselect = true;
@@ -1214,44 +1214,58 @@ namespace TemuKJD.WXForms.ProductForms
 			// 显示对话框并获取结果
 			if (openFileDialog.ShowDialog() == DialogResult.OK)
 			{
-				var filePathLst = openFileDialog.FileNames.ToList();
-				int successNum = 0;
-				int failedNum = 0;
-				var pddtoWxFactory = new PDDProdFormConverter();
-
-				foreach (var filePath in filePathLst)
+				try
 				{
-					string sourceContent = "";
-					string content = "";
-					string rst = "商品未识别";
-					int day = txt_listing_time.Text.ParseToInt(0) * -1;
-					try
-					{
-						rst = pddtoWxFactory.PddFrontToPddBackConvertFactory(filePath, true, null, true, listingTime: DateTime.Now.AddDays(day));
-					}
-					catch (Exception ex)
-					{
-						rst = ex.Message;
-					}
-					if (string.IsNullOrEmpty(rst))
-						successNum++;
-					else
-						failedNum++;
+					btn_import_wx.Enabled = false;
+					var filePathLst = openFileDialog.FileNames.ToList();
+					int successNum = 0;
+					int failedNum = 0;
+					var pddtoWxFactory = new PDDProdFormConverter();
 
+					await Task.Run(() =>
+					{
+						foreach (var filePath in filePathLst)
+						{
+							string sourceContent = "";
+							string content = "";
+							string rst = "商品未识别";
+							int day = txt_listing_time.Text.ParseToInt(0) * -1;
+							try
+							{
+								rst = pddtoWxFactory.PddFrontToPddBackConvertFactory(filePath, true, null, true, listingTime: DateTime.Now.AddDays(day));
+							}
+							catch (Exception ex)
+							{
+								rst = ex.Message;
+							}
+							if (string.IsNullOrEmpty(rst))
+								successNum++;
+							else
+								failedNum++;
+
+							Invoke(new Action(() =>
+							{
+								this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1);
+								this.statusBar.lblTaskStatus.Text = "正在导入，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum;
+							}));
+						}
+					});
+					SearchDbProd(1, " 导入完成，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum);
 					Invoke(new Action(() =>
 					{
-						this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1);
-						this.statusBar.lblTaskStatus.Text = "正在导入，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum;
+						btn_import_wx.Enabled = true;
+						pbLoading.Visible = false;
+						this.statusBar.lblTaskStatus.Text = "导入完成，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum;
+						BaseMsgForm.ShowInfo("导入完成！");
 					}));
 				}
-
-				SearchDbProd(1, " 导入完成，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum);
-				Invoke(new Action(() =>
+				finally
 				{
-					pbLoading.Visible = false;
-					this.statusBar.lblTaskStatus.Text = "导入完成，尝试导入" + (successNum + failedNum) + "，成功" + successNum + "，失败" + failedNum;
-					BaseMsgForm.ShowInfo("导入完成！");
-				}));
+					Invoke(new Action(() =>
+					{
+						btn_import_wx.Enabled = true;
+					}));
+				}
 			}
 
 		}