From 614b015417ed10f01406a6be8de071e682fdb1bf Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Thu, 25 Jun 2026 06:22:42 +0000
Subject: [PATCH] SVN r1233

SVN-Revision: r1233
---
 插件库/Lskj.PubBomImport/FrmMain.Designer.cs | 2 ++
 插件库/Lskj.PubBomImport/FrmProgress.cs      | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmMain.Designer.cs b/插件库/Lskj.PubBomImport/FrmMain.Designer.cs
index 36c4dfd..af5dc6a 100644
--- a/插件库/Lskj.PubBomImport/FrmMain.Designer.cs
+++ b/插件库/Lskj.PubBomImport/FrmMain.Designer.cs
@@ -248,6 +248,7 @@ namespace Lskj.PubBomImport
             this.gcMain.Name = "gcMain";
             this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
             this.gcMain.Size = new System.Drawing.Size(500, 444);
+            this.gcMain.SysModel = null;
             this.gcMain.TabIndex = 16;
             // 
             // gc_Right
@@ -259,6 +260,7 @@ namespace Lskj.PubBomImport
             this.gc_Right.Name = "gc_Right";
             this.gc_Right.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum;
             this.gc_Right.Size = new System.Drawing.Size(367, 444);
+            this.gc_Right.SysModel = null;
             this.gc_Right.TabIndex = 18;
             // 
             // FrmMain
diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs
index 17e1e86..27336a5 100644
--- a/插件库/Lskj.PubBomImport/FrmProgress.cs
+++ b/插件库/Lskj.PubBomImport/FrmProgress.cs
@@ -3911,8 +3911,6 @@ namespace Lskj.PubBomImport
                 string suffix = Path.GetExtension(File);
                 string name = fileInfo.Name;
                 DateTime creationTime = fileInfo.CreationTime;
-                byte[] fileBytes = ConvertFileToBytes(File);
-                string fileStream = Convert.ToBase64String(fileBytes);
                 string userId = ERPInfo.Instance.UserId;
                 DateTime uploadTime = DateTime.Now;
                 string code = "";
@@ -4112,8 +4110,7 @@ namespace Lskj.PubBomImport
             catch (Exception ex)
             {
                 returnMsg = ex.Message;
-                throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}");
-                isUpload = false;
+                throw new Exception($"文件{Path.GetFileName(filePath)}上传失败\r\n{ex.Message}", ex);
             }
             msg = returnMsg;
             outFileId = fileId;