This commit is contained in:
2025-08-28 13:26:51 +08:00
parent 2d1033548e
commit 2e7aa3e2be
3 changed files with 12 additions and 9 deletions

View File

@@ -262,7 +262,7 @@ GROUP BY F_PaperNumber, FSALEORGID
WHERE ( ( A.FSALEORGID = 100302
AND C.FNAME NOT IN ('<EFBFBD><EFBFBD>ŵ<EFBFBD>Ƽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD><EFBFBD><EFBFBD>ŵ<EFBFBD>Ƽ<EFBFBD><EFBFBD><EFBFBD>չ<EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>ͻ<EFBFBD>-<2D><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9>'
,'<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD><EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>㶫̼<EFBFBD><EFBFBD><EFBFBD>ǿؿƼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾','<EFBFBD>㶫ŵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܿƼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޹<EFBFBD>˾')
) OR A.FSALEORGID != 100302) AND A.FDocumentStatus = 'C'
) OR A.FSALEORGID != 100302) AND A.FDocumentStatus = 'C' AND Cccc.F_correlation <> '1'
--AND EXISTS(SELECT 1 FROM T_SAL_ORDERENTRY bb WHERE bb.fid=a.fid )
) A
--where [<EFBFBD><EFBFBD><EFBFBD>۵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ID]= 102802

View File

@@ -213,7 +213,7 @@ ORDER BY FDATE
WHERE FVERIFYSEQ IN (SELECT FVERIFYSEQ FROM T_AR_RECMacthLog a
LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID
WHERE b.FSRCBILLNO=@FBILLNO AND b.FSOURCETYPE='36cf265bd8c3452194ed9c83ec5e73d2' AND FVERIFYDATE>=@BeginDATE
) AND FVERIFYSEQ NOT IN (100135,100138,100042)
) AND FVERIFYSEQ NOT IN (100135,100138,100042,100141,100139)
--SELECT * FROM #temp2
--SELECT @amount= SUM(FCURWRITTENOFFAMOUNT) FROM #temp2 WHERE FBILLFORMID !='AR_RECEIVEBILL'
SELECT @fid2=FSRCBILLID,@fid3=FVERIFYSEQ FROM #temp2 WHERE FBILLFORMID ='AR_receivable'
@@ -247,7 +247,7 @@ ORDER BY FDATE
,[ShouKuanFDate]
,[BenCiHeXiao]
,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',@fid3
( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR*FALLAMOUNTFOR_D,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD>',d.FVERIFYSEQ
,dd.FEXCHANGERATE,dd.FSettleCurrId,dd.FLOCALCURRID,0 ,@remark
FROM T_SAL_ORDER a
LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID
@@ -274,7 +274,7 @@ ORDER BY FDATE
,[ShouKuanFDate]
,[BenCiHeXiao]
,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark)
( SELECT 0,'','',@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>',@fid3
( SELECT 0,'','',@ShouKuanFID,@FBILLNO,d.FVERIFYDATE,FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧ<EFBFBD>պ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD><EFBFBD><EFBFBD>ڳ<EFBFBD>Ӧ<EFBFBD>յ<EFBFBD>',FVERIFYSEQ
,FEXCHANGERATE,FCURRENCYID,FLOCALCURRID,0 ,@remark
FROM #temp2 d
WHERE d.FBILLFORMID='AR_RECEIVEBILL' )
@@ -405,7 +405,7 @@ WHERE
(SELECT DISTINCT FVERIFYSEQ from T_AR_RECMacthLog oo LEFT JOIN T_AR_RECMACTHLOGENTRY ll ON oo.FID=ll.FID
LEFT JOIN T_BAS_BILLTYPE c ON ll.FSOURCETYPE=c.FBILLTYPEID
WHERE FBILLFORMID='AR_RECEIVEBILL'
) AND FVERIFYSEQ NOT IN (100135,100138,100042)
) AND FVERIFYSEQ NOT IN (100135,100138,100042,100140) AND FVERIFYSEQ NOT IN (100135,100138,100042,100141,100139)
ORDER BY a.FVERIFYSEQ;
INSERT INTO [dbo].[ZZZ_HeXiaoBook]

View File

@@ -81,16 +81,19 @@ BEGIN
-- <20><><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD><D5BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
IF (@rowId != @fid)
BEGIN
SELECT @rowId = @fid,
@amount = @F_AMOUNT - @F_EXPENSES;
SELECT @rowId = @fid,@amount = @F_AMOUNT;
--@amount = @F_AMOUNT - @F_EXPENSES;
END;
PRINT @amount;
IF (@amount >= @FRecAdvanceAmount and @FRecAdvanceAmount>0)
BEGIN
DECLARE @tempF_EXPENSES DECIMAL(18,2)=0;---<EFBFBD><EFBFBD>ʱ<EFBFBD>˷ѱ<EFBFBD><EFBFBD><EFBFBD>
UPDATE T_SAL_ORDERPLAN
SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount
SET F_MBBA_DECIMAL_UKY = @FRecAdvanceAmount+@F_EXPENSES*FRECADVANCERATE*0.01,@tempF_EXPENSES=@F_EXPENSES*FRECADVANCERATE*0.01
WHERE FENTRYID = @wfid;
SELECT @amount = @amount - @FRecAdvanceAmount;
SELECT @amount = @amount - @FRecAdvanceAmount-@tempF_EXPENSES;
END;
ELSE
BEGIN