SVN r1094
SVN-Revision: r1094
This commit is contained in:
@@ -2672,14 +2672,14 @@ namespace Lskj.PubBomImport
|
|||||||
throw new Exception($"明细数据不能空");
|
throw new Exception($"明细数据不能空");
|
||||||
}
|
}
|
||||||
SetProcessBar(40, 0);
|
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"))
|
if (selectModelValue.Equals("2"))
|
||||||
{
|
{
|
||||||
billMasterSql = $"select '' as billdocument_id,'0' affirmer,'0' rtagid,'{productId}' as productid,'{selectBakValue}' as bak,'{fileNameExtension}' as bombb,'' as bombc";
|
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"))
|
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);
|
DataRow masterRow = BillImpl.GetDataRowResult(billMasterSql);
|
||||||
@@ -4130,7 +4130,7 @@ namespace Lskj.PubBomImport
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
returnMsg = "上传请求失败";
|
returnMsg = $"上传请求失败,{result}";
|
||||||
isUpload = false;
|
isUpload = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user