From 559269bd1afb1e0cace042fd9fa449d141994a86 Mon Sep 17 00:00:00 2001
From: tdx <tdx@local>
Date: Fri, 19 Sep 2025 09:52:23 +0000
Subject: [PATCH] SVN r996

SVN-Revision: r996
---
 插件库/Lskj.PubBomImport/FrmProgress.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs
index e529b34..cb93c06 100644
--- a/插件库/Lskj.PubBomImport/FrmProgress.cs
+++ b/插件库/Lskj.PubBomImport/FrmProgress.cs
@@ -2612,6 +2612,7 @@ namespace Lskj.PubBomImport
                                     frmBillInfo.OnBillAdd();
                                     SetProcessBar(0, 0);
                                     SetProcessMsg($"正在导入：{Path.GetFileName(mxInfo.FullName)}");
+                                    string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(mxInfo.FullName);
                                     DataTable childTable = frmBillInfo.GcMainView.GridControl.DataSourceTable().Clone();
                                     var mxCodeRows = parentTable.AsEnumerable();
                                     string[] fieldDic = Model.MainFieldDic.Split(',');
@@ -2644,14 +2645,14 @@ namespace Lskj.PubBomImport
                                         throw new Exception($"明细数据不能空");
                                     }
                                     SetProcessBar(40, 0);
-                                    string billMasterSql = $"select (select top 1 billdocument_id from bom_BillTab where productid='{productId}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'' as bombb,'' as bombc";
+                                    string billMasterSql = $"select (select top 1 billdocument_id from bom_BillTab where productid='{productId}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameWithoutExtension}' as bombb,'' as bombc";
                                     if (selectModelValue.Equals("2"))
                                     {
-                                        billMasterSql = $"select '' as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'' as bombb,'' as bombc";
+                                        billMasterSql = $"select '' as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameWithoutExtension}' as bombb,'' as bombc";
                                     }
                                     else if (selectModelValue.Equals("1"))
                                     {
-                                        billMasterSql = $"select (select top 1 billdocument_id from bom_BillTab where productid='{productId}' and billdocument_id = '{selectVerValue}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'' as bombb,'' as bombc";
+                                        billMasterSql = $"select (select top 1 billdocument_id from bom_BillTab where productid='{productId}' and billdocument_id = '{selectVerValue}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameWithoutExtension}' as bombb,'' as bombc";
                                     }
                                     // 处理单据表头数据
                                     DataRow masterRow = BillImpl.GetDataRowResult(billMasterSql);