SVN r998
SVN-Revision: r998
This commit is contained in:
@@ -2612,7 +2612,7 @@ namespace Lskj.PubBomImport
|
|||||||
frmBillInfo.OnBillAdd();
|
frmBillInfo.OnBillAdd();
|
||||||
SetProcessBar(0, 0);
|
SetProcessBar(0, 0);
|
||||||
SetProcessMsg($"正在导入:{Path.GetFileName(mxInfo.FullName)}");
|
SetProcessMsg($"正在导入:{Path.GetFileName(mxInfo.FullName)}");
|
||||||
string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(mxInfo.FullName).Replace("'", "''");
|
string fileNameExtension = Path.GetFileName(mxInfo.FullName).Replace("'", "''");
|
||||||
DataTable childTable = frmBillInfo.GcMainView.GridControl.DataSourceTable().Clone();
|
DataTable childTable = frmBillInfo.GcMainView.GridControl.DataSourceTable().Clone();
|
||||||
var mxCodeRows = parentTable.AsEnumerable();
|
var mxCodeRows = parentTable.AsEnumerable();
|
||||||
string[] fieldDic = Model.MainFieldDic.Split(',');
|
string[] fieldDic = Model.MainFieldDic.Split(',');
|
||||||
@@ -2645,14 +2645,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,'{fileNameWithoutExtension}' 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,'{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,'{fileNameWithoutExtension}' 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,'{fileNameWithoutExtension}' 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,'{fileNameExtension}' as bombb,'' as bombc";
|
||||||
}
|
}
|
||||||
// 处理单据表头数据
|
// 处理单据表头数据
|
||||||
DataRow masterRow = BillImpl.GetDataRowResult(billMasterSql);
|
DataRow masterRow = BillImpl.GetDataRowResult(billMasterSql);
|
||||||
|
|||||||
Reference in New Issue
Block a user