Develop/PiolotTH_ReportFrom
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom into main

Browse Source
This commit is contained in:
余宇波 2025-08-05 20:23:29 +08:00
commit 6d407bdaf2
6 changed files with 94 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDWFHMX.cs
View File

@ -71,7 +71,7 @@ namespace GZ_LTHReportForms.ReporyDDWFH
header.AddChild("规格型号", new LocaleValue("规格型号"), SqlStorageType.Sqlnvarchar);
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);

6
YSZKDZBaoBiao/AccountsReceivableReport.cs
View File

@ -140,18 +140,20 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList));
var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString();
base.BuilderReportSqlAndTempTable(filter, tableName);
string sql = string.Format(@"/*dialect*/
--更新MX表中的字段
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}'
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}','{6}'
--更新MX表中的发票金额
EXEC GXFPJEYSDZDMX_GZTH '{0}','{1}'
--更新JY表
EXEC UpdateYSDZBJY_GZTH
", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH);
", FSDate, fDate, ZZFID, fClient,XSYFID,ZZHTH,SFQJFWDZ);
sql += string.Format(@"
INSERT INTO YingShouZhanKuanJY_GZTH(Number,OrderAmount,ShipmentsAmount,FBillAllAmount,

7
YSZKDZBaoBiao/AccountsReceivableReport2.cs
View File

@ -148,20 +148,21 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
XSYFID = XSY["Id"]?.ToString();
}
var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList));
var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString();
base.BuilderReportSqlAndTempTable(filter, tableName);
string sql = string.Format(@"/*dialect*/
--更新表中的字段
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}'
EXEC UpdateYSDZBMX_GZTH '{0}','{1}','{2}','{3}','{4}','{5}','{6}'
--更新表中的发票金额
EXEC GXFPJEYSDZDMX_GZTH '{0}','{1}'
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH);
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH,SFQJFWDZ);
sql += string.Format($@"/*dialect*/
INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额]

35
派诺报表SQL文件/应收对账表(明细创建).sql
View File

@ -12,6 +12,7 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FCUSTID varchar(1000),
@XSYFID varchar(1000),
@ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---是否区间范围对账
AS
BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@ -77,10 +78,15 @@ BEGIN
AND FApproveDate < @EndDate
AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH)
AND FDOCUMENTSTATUS = 'C'
UNION ALL
--销售订单
SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ
FROM T_SAL_ORDER
WHERE FDOCUMENTSTATUS = 'C'
AND 1= @SFQJFWDZ
)a
INSERT INTO
YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[是否K3数据],旧物料编码,NUMBER)
@ -122,14 +128,37 @@ BEGIN
UPDATE a
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
,a.[K3退货金额]=b.退货金额,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
,a.[K3退货金额]=b.退货金额--,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3seorder0701] b
ON a.FBILLNO=b.[单据编码] AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
ON C.F_K3SEQ = b.行号 AND a.FBILLNO=b.[单据编码] --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND B.日期 >= @StartDate
AND B.日期 < @EndDate
--k3专票
UPDATE a
SET a.[K3专票金额] = b.发票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3ICSale0802] b
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND b.发票类型 = '专'
--AND B.日期 >= @StartDate
--AND B.日期 < @EndDate
--k3普票
UPDATE a
SET a.[K3普票金额] = b.发票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3ICSale0802] b
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND b.发票类型 = '普'
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
FROM YingShouZhanKuanMX_GZTH A

42
派诺报表SQL文件/应收对账表(明细版存储过程).sql
View File

@ -1,10 +1,3 @@
USE [AIS20250723115352]
GO
/****** Object: StoredProcedure [dbo].[UpdateYSDZBMX_GZTH] Script Date: 2025/8/2 10:16:20 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSDATE varchar(1000),
@FEDATE varchar(1000),
@ -12,6 +5,7 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FCUSTID varchar(1000),
@XSYFID varchar(1000),
@ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---是否区间范围对账
AS
BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@ -77,10 +71,15 @@ BEGIN
AND FApproveDate < @EndDate
AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH)
AND FDOCUMENTSTATUS = 'C'
UNION ALL
--销售订单
SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ
FROM T_SAL_ORDER
WHERE FDOCUMENTSTATUS = 'C'
AND 1= @SFQJFWDZ
)a
INSERT INTO
YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[是否K3数据],旧物料编码,NUMBER)
@ -122,14 +121,37 @@ BEGIN
UPDATE a
SET a.[K3发货数量]=b.发货数量,a.[K3发货金额]=b.发货金额,a.[K3退货数量]=b.退货数量
,a.[K3退货金额]=b.退货金额,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
,a.[K3退货金额]=b.退货金额--,a.[K3专票金额] = b.专票金额 ,a.[K3普票金额]= b.普票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3seorder0701] b
ON a.FBILLNO=b.[单据编码] AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
ON C.F_K3SEQ = b.行号 AND a.FBILLNO=b.[单据编码] --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND B.日期 >= @StartDate
AND B.日期 < @EndDate
--k3专票
UPDATE a
SET a.[K3专票金额] = b.发票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3ICSale0802] b
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND b.发票类型 = '专'
--AND B.日期 >= @StartDate
--AND B.日期 < @EndDate
--k3普票
UPDATE a
SET a.[K3普票金额] = b.发票金额
FROM YingShouZhanKuanMX_GZTH A
INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID
INNER JOIN [oldk3ICSale0802] b
ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.合同号 --AND a.旧物料编码=[物料编码] AND a.FQty=[数量] AND (ABS(a.FTaxPrice-b.[含税单价])<=0.02 OR ABS(a.FTaxPrice-b.[面价])<=0.02)
WHERE 是否K3数据=0
AND b.发票类型 = '普'
UPDATE a SET a.[K3专票金额] = CASE B.rownumber WHEN 1 THEN b.专票金额 ELSE 0 END,a.[K3普票金额]= CASE B.rownumber WHEN 1 THEN b.普票金额 ELSE 0 END
FROM YingShouZhanKuanMX_GZTH A

13
派诺报表SQL文件/应收款对账单取发票金额(取数).sql
View File

@ -1,4 +1,4 @@
USE [AIS20250723115352]
USE [AIS2025]
GO
/****** Object: StoredProcedure [dbo].[GetIV_SALESICYSMX_GZTH] Script Date: 2025/8/2 10:25:18 ******/
SET ANSI_NULLS ON
@ -38,6 +38,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--销售增值税专用发票-应收单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -61,6 +62,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--销售增值税专用发票-应收单-销售出库单-发货通知单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -88,6 +90,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--销售增值税专用发票-应收单-销售出库单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -113,6 +116,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--销售增值税专用发票-应收单-期初销售出库单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -137,6 +141,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -164,6 +169,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--红票销售增值税专用发票-应收单-销售退货单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -189,6 +195,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--红票销售增值税专用发票-应收单-销售退货单-退货通知单-销售出库单-发货通知单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -218,6 +225,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-发货通知单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -245,6 +253,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--红票销售增值税专用发票-应收单-销售退货单-销售出库单-销售订单
INSERT INTO FPYSDZDMX(XSDDFID,XSDDFENTRYID,FPJSZZ,FPLX,FPRQ,FPFID,FPFENTRYID,KPJE)
@ -271,6 +280,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--对表的数据进行分组合计
SELECT DISTINCT
@ -326,6 +336,7 @@ BEGIN
AND A.FDOCUMENTSTATUS = 'C'
AND A.FApproveDate >= @StartDate
AND A.FApproveDate < @EndDate
AND A.F_SFQC = 0
--对表进行分组合计
SELECT DISTINCT