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 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,

View File

@ -147,21 +147,22 @@ 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,[退],[]

View File

@ -11,7 +11,8 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSaleOrgId varchar(1000),
@FCUSTID varchar(1000),
@XSYFID varchar(1000),
@ZZHTH varchar(1000)
@ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---
AS
BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@ -77,9 +78,14 @@ 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

View File

@ -4,7 +4,8 @@ ALTER PROCEDURE [dbo].[UpdateYSDZBMX_GZTH]
@FSaleOrgId varchar(1000),
@FCUSTID varchar(1000),
@XSYFID varchar(1000),
@ZZHTH varchar(1000)
@ZZHTH varchar(1000)
,@SFQJFWDZ varchar(1000) ---
AS
BEGIN
DECLARE @StartDate DATE = CONVERT(DATE, @FSDATE);
@ -70,9 +71,14 @@ 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