1
This commit is contained in:
parent
d29256abe5
commit
d3e7185925
@ -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,
|
||||
|
||||
@ -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,[星空退货金额],[星空发货金额]
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -5,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);
|
||||
@ -70,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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user