1
This commit is contained in:
@@ -73,6 +73,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH
|
|||||||
header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal);
|
header.AddChild("含税单价", new LocaleValue("含税单价"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal);
|
header.AddChild("折扣率", new LocaleValue("折扣率"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal);
|
header.AddChild("价税合计", new LocaleValue("价税合计"), SqlStorageType.SqlDecimal);
|
||||||
|
header.AddChild("整单价税合计", new LocaleValue("整单价税合计"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal);
|
header.AddChild("已发货数量", new LocaleValue("已发货数量"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal);
|
header.AddChild("已发货金额", new LocaleValue("已发货金额"), SqlStorageType.SqlDecimal);
|
||||||
header.AddChild("未发货数量", new LocaleValue("未发货数量"), SqlStorageType.SqlDecimal);
|
header.AddChild("未发货数量", new LocaleValue("未发货数量"), SqlStorageType.SqlDecimal);
|
||||||
|
|||||||
@@ -346,6 +346,10 @@ def BuilderReportSqlAndTempTable(Filter,tableName):
|
|||||||
FROM (SELECT DISTINCT ACO22.<2E><><EFBFBD><EFBFBD>,ACO22.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,ACO22.<2E><><EFBFBD><EFBFBD> FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b
|
FROM (SELECT DISTINCT ACO22.<2E><><EFBFBD><EFBFBD>,ACO22.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,ACO22.<2E><><EFBFBD><EFBFBD> FROM ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO22 ) b
|
||||||
WHERE <20><><EFBFBD><EFBFBD>Ա=b.<2E><><EFBFBD><EFBFBD>
|
WHERE <20><><EFBFBD><EFBFBD>Ա=b.<2E><><EFBFBD><EFBFBD>
|
||||||
|
|
||||||
|
/*<2A><><EFBFBD><EFBFBD>Ա'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'ʱ<EFBFBD><EFBFBD>SBU<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'*/
|
||||||
|
UPDATE #TEMP3 SET SBU=<3D><><EFBFBD><EFBFBD>Ա,[<5B><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>]=<3D><><EFBFBD><EFBFBD>Ա
|
||||||
|
WHERE <20><><EFBFBD><EFBFBD>Ա='Ӧ<EFBFBD>տ<EFBFBD>ר<EFBFBD><EFBFBD>С<EFBFBD><EFBFBD>'
|
||||||
|
|
||||||
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>β<EFBFBD><CEB2>*/
|
/*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>β<EFBFBD><CEB2>*/
|
||||||
UPDATE T1 SET <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> = ISNULL(T1.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)+(ISNULL(T1.<2E><><EFBFBD><EFBFBD>,0)-ISNULL(T2.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) FROM #TEMP3 T1
|
UPDATE T1 SET <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> = ISNULL(T1.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)+(ISNULL(T1.<2E><><EFBFBD><EFBFBD>,0)-ISNULL(T2.<2E><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) FROM #TEMP3 T1
|
||||||
INNER JOIN(SELECT ShouKuanFid,SUM(ISNULL(<28><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> FROM #TEMP3 GROUP BY ShouKuanFid) T2 ON T1.ShouKuanFid = T2.ShouKuanFid
|
INNER JOIN(SELECT ShouKuanFid,SUM(ISNULL(<28><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD>,0)) <20><>̯<EFBFBD><CCAF><EFBFBD><EFBFBD> FROM #TEMP3 GROUP BY ShouKuanFid) T2 ON T1.ShouKuanFid = T2.ShouKuanFid
|
||||||
|
|||||||
@@ -354,9 +354,9 @@ namespace Pilot.Report.Exploitation.AccountsReceivable
|
|||||||
n++;
|
n++;
|
||||||
|
|
||||||
//根据订单号分组合并单元格
|
//根据订单号分组合并单元格
|
||||||
if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-2)
|
if(list[i]["CONTRACTNUMBER"].ToString() != GroupCONTRACTNUMBER || i == list.Count-3)
|
||||||
{
|
{
|
||||||
int k = (i == list.Count - 2 && list[i]["CONTRACTNUMBER"].ToString() == GroupCONTRACTNUMBER) ? 0 : 1;
|
int k = (i == list.Count - 3 && list[i]["CONTRACTNUMBER"].ToString() == GroupCONTRACTNUMBER) ? 0 : 1;
|
||||||
if (GroupCount > 1 || k == 0)
|
if (GroupCount > 1 || k == 0)
|
||||||
{
|
{
|
||||||
// 创建CellRangeAddress对象
|
// 创建CellRangeAddress对象
|
||||||
|
|||||||
Reference in New Issue
Block a user