This commit is contained in:
liqionghai
2025-08-04 20:33:35 +08:00
parent d29256abe5
commit d3e7185925
4 changed files with 24 additions and 9 deletions

View File

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

View File

@@ -148,20 +148,21 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
XSYFID = XSY["Id"]?.ToString(); XSYFID = XSY["Id"]?.ToString();
} }
var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList)); var fProject = fProjectList == null ? "" : (string.Join(",", fProjectList));
var SFQJFWDZ = customFilter["F_ALL_GROUP2"]?.ToString();
base.BuilderReportSqlAndTempTable(filter, tableName); base.BuilderReportSqlAndTempTable(filter, tableName);
string sql = string.Format(@"/*dialect*/ 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}' EXEC GXFPJEYSDZDMX_GZTH '{0}','{1}'
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH); ", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH,SFQJFWDZ);
sql += string.Format($@"/*dialect*/ sql += string.Format($@"/*dialect*/
INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount, INSERT INTO YingShouZhanKuanMX_GZTH(NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额] ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额]

View File

@@ -12,6 +12,7 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FCUSTID varchar(1000), @FCUSTID varchar(1000),
@XSYFID varchar(1000), @XSYFID varchar(1000),
@ZZHTH varchar(1000) @ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AS AS
BEGIN BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@@ -77,10 +78,15 @@ BEGIN
AND FApproveDate < @EndDate AND FApproveDate < @EndDate
AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH) AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH)
AND FDOCUMENTSTATUS = 'C' AND FDOCUMENTSTATUS = 'C'
UNION ALL
--<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>
SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ
FROM T_SAL_ORDER
WHERE FDOCUMENTSTATUS = 'C'
AND 1= @SFQJFWDZ
)a )a
INSERT INTO INSERT INTO
YingShouZhanKuanMX_GZTH YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER) (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER)

View File

@@ -5,6 +5,7 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FCUSTID varchar(1000), @FCUSTID varchar(1000),
@XSYFID varchar(1000), @XSYFID varchar(1000),
@ZZHTH varchar(1000) @ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---<EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
AS AS
BEGIN BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE); DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@@ -70,10 +71,15 @@ BEGIN
AND FApproveDate < @EndDate AND FApproveDate < @EndDate
AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH) AND (ISNULL(@ZZHTH,'') = '' OR F_PAPERNUMBER = @ZZHTH)
AND FDOCUMENTSTATUS = 'C' AND FDOCUMENTSTATUS = 'C'
UNION ALL
--<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>
SELECT F_CONTRACTNUMBER ZHHTH,FSALEORGID ZZ
FROM T_SAL_ORDER
WHERE FDOCUMENTSTATUS = 'C'
AND 1= @SFQJFWDZ
)a )a
INSERT INTO INSERT INTO
YingShouZhanKuanMX_GZTH YingShouZhanKuanMX_GZTH
(FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER) (FID,FENTRYID,FSaleOrgId,FBILLNO,FSalerId,[DATE],CONTRACTNUMBER,ProjectName,SizeModel,FQty,FTaxPrice,FAllAmount,OrderAmount,PaymentAmount,[<EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>,NUMBER)