Merge branch 'master' of http://8.130.121.29:3000/Develop/Piolot_RepotForm_PeiHao
This commit is contained in:
commit
36effa3438
@ -54,6 +54,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
|
|||||||
string fDate = rptTitles.FirstOrDefault(a => a.TitleKey == "FDate").TitleValue.ToString();
|
string fDate = rptTitles.FirstOrDefault(a => a.TitleKey == "FDate").TitleValue.ToString();
|
||||||
string fProject = rptTitles.FirstOrDefault(a => a.TitleKey == "FProject").TitleValue.ToString();
|
string fProject = rptTitles.FirstOrDefault(a => a.TitleKey == "FProject").TitleValue.ToString();
|
||||||
string FState = rptTitles.FirstOrDefault(a => a.TitleKey == "FState").TitleValue.ToString();
|
string FState = rptTitles.FirstOrDefault(a => a.TitleKey == "FState").TitleValue.ToString();
|
||||||
|
string F_SFYJKH = rptTitles.FirstOrDefault(a => a.TitleKey == "F_SFYJKH").TitleValue.ToString();
|
||||||
//单据体
|
//单据体
|
||||||
var list = reportModel.DataSource.Rows;
|
var list = reportModel.DataSource.Rows;
|
||||||
|
|
||||||
@ -71,14 +72,14 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
|
|||||||
fDate2 = sqlTestList[0]["FDate"].ToString().Split(' ')[0];
|
fDate2 = sqlTestList[0]["FDate"].ToString().Split(' ')[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, Context);
|
Main(filePath, fClient, fDate, fProject, list, Num, fAmount, fDate2, F_SFYJKH, Context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 赋值EXCEL
|
/// 赋值EXCEL
|
||||||
/// </summary>
|
/// </summary>
|
||||||
static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount,string fDate2, Kingdee.BOS.Context Context)
|
static void Main(string outputFilePath, string fClient, string fDate, string fProject, DataRowCollection list, int Num, decimal fAmount,string fDate2, string F_SFYJKH, Kingdee.BOS.Context Context)
|
||||||
{
|
{
|
||||||
#region Excel代码
|
#region Excel代码
|
||||||
|
|
||||||
@ -200,7 +201,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
|
|||||||
cell.SetCellValue("尊敬的 " + fClient + " 客户您好,我公司已根据合同/订单的要求向贵公司交付相关产品并请验收确认,鉴于我公司对贵公司已通知发货部分的交付义务已完成,");
|
cell.SetCellValue("尊敬的 " + fClient + " 客户您好,我公司已根据合同/订单的要求向贵公司交付相关产品并请验收确认,鉴于我公司对贵公司已通知发货部分的交付义务已完成,");
|
||||||
cell2.SetCellValue(fClient);
|
cell2.SetCellValue(fClient);
|
||||||
var fAmountZW = ToChineseNumber(fAmount, Context);
|
var fAmountZW = ToChineseNumber(fAmount, Context);
|
||||||
if (Num > 0)
|
if (Num > 0 && F_SFYJKH == "2")
|
||||||
{
|
{
|
||||||
cel3.SetCellValue("其中上期(截止" + fDate2 + "共欠我公司货款金额为:" + fAmount + "元(大写:" + fAmountZW + ")");
|
cel3.SetCellValue("其中上期(截止" + fDate2 + "共欠我公司货款金额为:" + fAmount + "元(大写:" + fAmountZW + ")");
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user