diff --git a/YSZKDZBaoBiao/AccountsReceivableReport.cs b/YSZKDZBaoBiao/AccountsReceivableReport.cs index cfd8549..4d9934a 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport.cs @@ -201,7 +201,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements } sql += string.Format(@" SELECT - ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID, + --ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID, + ROW_NUMBER() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN 999998 WHEN '合计' THEN 999999 ELSE CONVERT(INT,[NUMBER]) END),[FID]) AS FIDENTITYID, * INTO {0} FROM YingShouZhanKuanJY_GZTH diff --git a/YSZKDZBaoBiao/AccountsReceivableReport2.cs b/YSZKDZBaoBiao/AccountsReceivableReport2.cs index 888cad3..317fc5a 100644 --- a/YSZKDZBaoBiao/AccountsReceivableReport2.cs +++ b/YSZKDZBaoBiao/AccountsReceivableReport2.cs @@ -209,8 +209,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements } sql += string.Format(@" SELECT - ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID, - DENSE_RANK() OVER (ORDER BY [DATE] DESC,[FID] ) AS OUTPUTNUMBER, + --ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) AS FIDENTITYID, + --DENSE_RANK() OVER (ORDER BY [DATE] DESC,[FID] ) AS OUTPUTNUMBER, + ROW_NUMBER() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN 999998 WHEN '合计' THEN 999999 ELSE CONVERT(INT,[NUMBER]) END),[FID]) AS FIDENTITYID, + DENSE_RANK() OVER (ORDER BY (CASE [NUMBER] WHEN '待核销' THEN 999998 WHEN '合计' THEN 999999 ELSE CONVERT(INT,[NUMBER]) END),[FID] ) AS OUTPUTNUMBER, * INTO {0} FROM YingShouZhanKuanMX_GZTH diff --git a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs index 557026b..3f39607 100644 --- a/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs +++ b/YSZKDZGongNeng_MX/LiteVersionPlugIn2.cs @@ -46,7 +46,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable string F_SFYJKH = rptTitles.FirstOrDefault(a => a.TitleKey == "F_SFYJKH").TitleValue.ToString(); //string FPath = "应收账款对账单【明细版】.xlsx"; - string FPath = string.Format("{0}-{1}-应收账款对账单【明细版】.xlsx", DateTime.Now.ToString("yyyyMMdd"), fClient); + string FPath = string.Format("{0}-{1}-应收账款对账单【明细版】.xlsx", string.IsNullOrWhiteSpace(fDate) ? DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") : fDate, fClient); // 在临时文件目录，生成一个完整的文件名: C:\Program Files\Kingdee\K3Cloud\WebSite\...\JD.xls string filePath = PathUtils.GetPhysicalPath(KeyConst.TEMPFILEPATH, Path.GetFileName(FPath)); @@ -96,6 +96,8 @@ namespace Pilot.Report.Exploitation.AccountsReceivable //获取工作簿中的第一个工作表（索引为0） ISheet sheet = workbook.GetSheetAt(0); + //冻结该工作表至13行 + sheet.CreateFreezePane(0,13); #endregion @@ -290,7 +292,10 @@ namespace Pilot.Report.Exploitation.AccountsReceivable //将新创建或获取的单元格的值修改 cell22.SetCellValue(""); var YFHpriceSumZW = ToChineseNumber(YFHpriceSum, Context); - cell3.SetCellValue("贵公司截至 " + (string.IsNullOrWhiteSpace(fDate)? DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") : fDate) + " 共欠我公司货款金额为：" + YFHpriceSum.ToString("N") + "元（大写："+ YFHpriceSumZW + "）"); + + string CommonDate= string.IsNullOrWhiteSpace(fDate) ? DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") : fDate; + + cell3.SetCellValue("贵公司截至 " + CommonDate + " 共欠我公司货款金额为：" + YFHpriceSum.ToString("N") + "元（大写："+ YFHpriceSumZW + "）"); //将新创建或获取的单元格的值修改 cell.SetCellValue("尊敬的 " + fClient + " 客户您好，我公司已根据合同/订单的要求向贵公司交付相关产品并请验收确认，鉴于我公司对贵公司已通知发货部分的交付义务已完成，"); cell2.SetCellValue(fClient); @@ -339,18 +344,25 @@ namespace Pilot.Report.Exploitation.AccountsReceivable // rowi = sheet.CreateRow(j + list.Count-2); // j = 12; //} + string CONTRACTNUMBER = list[i]["CONTRACTNUMBER"].ToString(); ICell c1 = rowi.CreateCell(0); - if (list[i]["Number"].ToString() == "合计" || list[i]["Number"].ToString() == "待核销") + if (list[i]["Number"].ToString() == "合计") { c1.SetCellValue(list[i]["Number"].ToString()); } + else if(list[i]["Number"].ToString() == "待核销") + { + c1.SetCellValue(""); + CONTRACTNUMBER = list[i]["Number"].ToString(); + } else { c1.SetCellValue(list[i]["OUTPUTNUMBER"].ToString()); } + c1.CellStyle = cellStyle3; ICell c2 = rowi.CreateCell(1); c2.SetCellValue(""+date+""); c2.CellStyle = cellStyle2; - ICell c3 = rowi.CreateCell(2); c3.SetCellValue(list[i]["CONTRACTNUMBER"].ToString()); c3.CellStyle = cellStyle2; + ICell c3 = rowi.CreateCell(2); c3.SetCellValue(CONTRACTNUMBER); c3.CellStyle = cellStyle2; ICell c4 = rowi.CreateCell(3); c4.SetCellValue(list[i]["ProjectName"].ToString()); c4.CellStyle = cellStyle2; ICell c5 = rowi.CreateCell(4); c5.SetCellValue(list[i]["SizeModel"].ToString()); c5.CellStyle = cellStyle2; @@ -773,7 +785,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivable //移除第二个工作表 workbook.RemoveSheetAt(1); //重命名工作表 - workbook.SetSheetName(0, string.Format("明细版{0}", DateTime.Now.ToString("yyyy-MM-dd"))); + workbook.SetSheetName(0, string.Format("明细版{0}", CommonDate)); #endregion #region Excel代码2 diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index 2ad6a8b..7e5cb42 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -67,7 +67,8 @@ BEGIN FROM T_IV_SALESIC T1 WHERE (FSETTLEORGID = @FSaleOrgId OR ISNULL(@FSaleOrgId,'') = '') AND FCUSTOMERID = @FCUSTID --ͻ - AND FApproveDate >= '2025-01-01' + AND FApproveDate >= '2025-01-01' + AND FApproveDate >= @FSDATE AND FApproveDate < @EndDate AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH) AND FDOCUMENTSTATUS = 'C' @@ -79,6 +80,14 @@ BEGIN WHERE FDOCUMENTSTATUS = 'C' AND FApproveDate < @EndDate AND 1= @SFQJFWDZ + UNION ALL + --۶ + SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ + FROM T_SAL_ORDER + WHERE FDOCUMENTSTATUS = 'C' + AND FApproveDate >= @FSDATE + AND FApproveDate < @EndDate + AND 2= @SFQJFWDZ )a @@ -102,7 +111,7 @@ BEGIN ,A.F_Amount AS ۼƺ ,0 AS ǷK3 ,tmm.FOldNumber - ,ROW_NUMBER() OVER(ORDER BY A.FID) AS NUMBER + ,ROW_NUMBER() OVER(ORDER BY A.FApproveDate DESC,A.FID) AS NUMBER FROM T_SAL_ORDER A INNER JOIN ( SELECT T1.FID,SUM(T1.FALLAMOUNT_LC) FBillAllAmount diff --git a/派诺报表SQL文件/应收对账表(简易)更新数据.sql b/派诺报表SQL文件/应收对账表(简易)更新数据.sql index 7220876..18da80b 100644 --- a/派诺报表SQL文件/应收对账表(简易)更新数据.sql +++ b/派诺报表SQL文件/应收对账表(简易)更新数据.sql @@ -57,7 +57,7 @@ FROM YingShouZhanKuanJY_GZTH A INNER JOIN ( SELECT FID, - ROW_NUMBER() OVER (ORDER BY FID) as row_num1 + ROW_NUMBER() OVER (ORDER BY [DATE] DESC,[FID]) as row_num1 FROM YingShouZhanKuanJY_GZTH ) B On A.FID = B.FID