This commit is contained in:
liqionghai
2025-08-28 19:14:57 +08:00
parent a81583fe4b
commit a8c575b958
3 changed files with 37 additions and 21 deletions

View File

@@ -164,11 +164,22 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
", FSDate,fDate,ZZFID,fClient,XSYFID,ZZHTH,SFQJFWDZ);
sql += string.Format($@"/*dialect*/
INSERT INTO YingShouZhanKuanMX_GZTH(FID,NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
INSERT INTO YingShouZhanKuanMX_GZTH(FID,NUMBER,PaymentAmount,ShippedDebt,InvoicedDebt)
Select 999998,'待核销'
,Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS DHXJE
,-Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS YCHQK
,-Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS YKPQK
From T_AR_RECEIVEBILL T1
Where 1=1
And FDOCUMENTSTATUS = 'C'
And FCONTACTUNIT ={fClient}
INSERT INTO YingShouZhanKuanMX_GZTH(FID,NUMBER,FQTY,FALLAMOUNT,OrderAmount,ShipmentsNum,ShipmentsAmount,
ReturnNum,ReturnAmount,BillingAmount,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,[K3退货金额],PPBillingAmount,ZPBillingAmount,[星空退货金额],[星空发货金额]
,[K3发货数量],[K3发货金额],[星空发货数量],[K3退货数量],[星空退货数量],[K3专票金额],[K3普票金额])
SELECT
999998,
999999,
'合计',
SUM(FQTY),
SUM(FALLAMOUNT),
@@ -190,12 +201,7 @@ namespace Pilot.Report.Exploitation.AccountsReceivableStatements
YingShouZhanKuanMX_GZTH
where 1=1
INSERT INTO YingShouZhanKuanMX_GZTH(FID,NUMBER,PaymentAmount)
Select 999999,'待核销',Sum((FRECAMOUNTFOR-F_AMOUNT)*FEXCHANGERATE) AS DHXJE
From T_AR_RECEIVEBILL T1
Where 1=1
And FDOCUMENTSTATUS = 'C'
And FCONTACTUNIT ={fClient}
");
if (fGROUP == "2")
{