From f5df57020f6f5e335f32ba7b508f8e31116c7efa Mon Sep 17 00:00:00 2001 From: tdx Date: Wed, 7 Jan 2026 10:19:52 +0000 Subject: [PATCH] SVN r1094 SVN-Revision: r1094 --- 插件库/Lskj.PubBomImport/FrmProgress.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/插件库/Lskj.PubBomImport/FrmProgress.cs b/插件库/Lskj.PubBomImport/FrmProgress.cs index 51b55ec..f703af0 100644 --- a/插件库/Lskj.PubBomImport/FrmProgress.cs +++ b/插件库/Lskj.PubBomImport/FrmProgress.cs @@ -2672,14 +2672,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,'{fileNameExtension}' as bombb,'' as bombc"; + string billMasterSql = $"select (select top 1 billdocument_id from {frmBillInfo.billModel.MasterTable} where productid='{productId}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameExtension}' as bombb,'' as bombc"; if (selectModelValue.Equals("2")) { billMasterSql = $"select '' as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameExtension}' 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,'{fileNameExtension}' as bombb,'' as bombc"; + billMasterSql = $"select (select top 1 billdocument_id from {frmBillInfo.billModel.MasterTable} where productid='{productId}' and billdocument_id = '{selectVerValue}') as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameExtension}' as bombb,'' as bombc"; } // 处理单据表头数据 DataRow masterRow = BillImpl.GetDataRowResult(billMasterSql); @@ -4130,7 +4130,7 @@ namespace Lskj.PubBomImport } else { - returnMsg = "上传请求失败"; + returnMsg = $"上传请求失败,{result}"; isUpload = false; } }