From eecf04873ac38f1d26172d1cc57e7420d6afabef Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Tue, 5 Aug 2025 15:46:47 +0800 Subject: [PATCH] 11 --- 非C#代码文件/刷退货源合同号SQL.txt | 92 ++++--------------------- 非C#代码文件/应收明细SQL.sql | 18 +++-- 非C#代码文件/收款单核销流水存储过程.sql | 51 +++++++++----- 3 files changed, 61 insertions(+), 100 deletions(-) diff --git a/非C#代码文件/刷退货源合同号SQL.txt b/非C#代码文件/刷退货源合同号SQL.txt index 7ec8a95..f6592a8 100644 --- a/非C#代码文件/刷退货源合同号SQL.txt +++ b/非C#代码文件/刷退货源合同号SQL.txt @@ -1,27 +1,4 @@ -SELECT TOP 10 F_sourorderno,* FROM dbo.T_SAL_ORDER -WHERE FBILLNO='PL-XSDD20250700766' - - -SELECT aaa.FID,jjj.F_CONTRACTNUMBER,jjj.FBILLNO,b.FSBILLID -FROM T_SAL_ORDER aaa LEFT JOIN -(SELECT FENTRYID,FID FROM T_SAL_ORDERENTRY cc ) ccc ON ccc.FID=aaa.FID -INNER JOIN -(SELECT FSTABLENAME,FSBILLID,aa.FENTRYID -FROM dbo.T_SAL_ORDERENTRY_LK aa - WHERE FSTABLENAME='T_SAL_ORDERENTRY' - ) b ON b.FENTRYID=ccc.FENTRYID -LEFT JOIN T_SAL_ORDER jjj ON b.FSBILLID=jjj.FID -WHERE aaa.FBILLNO='PL-XSDD20250700766' - - - -SELECT TOP 10 FSBILLID,FSID,* FROM dbo.T_SAL_ORDERENTRY_LK -WHERE FSTABLENAME='T_SAL_ORDERENTRY' - - -SELECT FSTABLENAME,FSBILLID FROM dbo.T_SAL_ORDERENTRY_LK - WHERE FENTRYID IN ( SELECT FENTRYID FROM dbo.T_SAL_ORDERENTRY WHERE FID = 1) - + ---第一步 BEGIN TRAN UPDATE T_SAL_ORDER SET F_SOURPAPERCONTRACT=ISNULL(bbbbb.F_CONTRACTNUMBER,''), F_sourorderno=ISNULL(bbbbb.FBILLNO,'') FROM @@ -42,73 +19,28 @@ WHERE bbbbb.FID=T_SAL_ORDER.FID ROLLBACK COMMIT -SELECT F_SOURPAPERCONTRACT,F_sourorderno,F_CONTRACTNUMBER,* FROM dbo.T_SAL_ORDER -WHERE (F_CONTRACTNUMBER LIKE '%HH%' OR F_CONTRACTNUMBER LIKE '%TH%') -AND F_SOURPAPERCONTRACT='' - -BEGIN TRAN -UPDATE T_SAL_ORDER SET F_SOURPAPERCONTRACT=ISNULL(AA.F_CONTRACTNUMBER,''), F_sourorderno=ISNULL(AA.FBILLNO,'') - FROM ( SELECT DISTINCT aa.fid,a.F_CONTRACTNUMBER ,a.FBILLNO FROM T_SAL_ORDER AA WITH(NOLOCK) - INNER JOIN T_SAL_ORDER a WITH(NOLOCK) ON aa.FSALEORGID = a.FSALEORGID AND (AA.F_contractnumber LIKE '%'+a.F_contractnumber+'%') - WHERE AA.FDOCUMENTSTATUS= 'C' AND aa.FSALEORGID = a.FSALEORGID - AND (( AA.F_contractnumber LIKE CONCAT(a.F_contractnumber, '-%') AND AA.F_contractnumber NOT LIKE CONCAT(a.F_contractnumber, '-%-%') ) - OR ( AA.F_contractnumber LIKE CONCAT(a.F_contractnumber, 'HH%') AND AA.F_contractnumber NOT LIKE CONCAT(a.F_contractnumber, 'HH%HH%') ) ) - AND aa.F_SOURPAPERCONTRACT='' - AND aa.fid IN ( - SELECT fid FROM dbo.T_SAL_ORDER -WHERE (F_CONTRACTNUMBER LIKE '%HH%' OR F_CONTRACTNUMBER LIKE '%TH%') -AND F_SOURPAPERCONTRACT='' -) - AND (aa.F_CONTRACTNUMBER LIKE '%HH%' OR aa.F_CONTRACTNUMBER LIKE '%TH%') - ) aa - WHERE aa.fid=T_SAL_ORDER.FID - - - SELECT F_SOURPAPERCONTRACT,F_sourorderno,F_Papercontract,* FROM dbo.T_SAL_RETURNNOTICE - WHERE FBILLNO='PL-THTZD20250700036' - - ---第一步：刷标准退货销售订单推退货通知单的-- + ---第二步：刷标准退货销售订单推退货通知单的-- BEGIN TRAN UPDATE T_SAL_RETURNNOTICE SET F_SOURPAPERCONTRACT=bb.F_SOURPAPERCONTRACT,F_sourorderno=bb.F_sourorderno FROM dbo.T_SAL_ORDER bb - WHERE T_SAL_RETURNNOTICE.F_Papercontract=bb.F_CONTRACTNUMBER AND T_SAL_RETURNNOTICE.FSALEORGID=bb.F_SALEORGID + WHERE T_SAL_RETURNNOTICE.F_Papercontract=bb.F_CONTRACTNUMBER AND T_SAL_RETURNNOTICE.FSALEORGID=bb.FSaleOrgId - ROLLBACK - ---第二步：刷非标准的直接从源销售订单推退货通知单的-- + COMMIT +---第三步：刷非标准的直接从源销售订单推退货通知单的-- BEGIN TRAN UPDATE T_SAL_RETURNNOTICE SET F_SOURPAPERCONTRACT=bb.F_CONTRACTNUMBER,F_sourorderno=bb.FBILLNO FROM (SELECT aa.fid, bb.F_CONTRACTNUMBER,bb.FBILLNO FROM T_SAL_RETURNNOTICE aa LEFT JOIN - dbo.T_SAL_ORDER bb ON aa.F_Papercontract=bb.F_CONTRACTNUMBER AND aa.FSALEORGID=bb.F_SALEORGID + dbo.T_SAL_ORDER bb ON aa.F_Papercontract=bb.F_CONTRACTNUMBER AND aa.FSALEORGID=bb.FSaleOrgId WHERE bb.F_SOURPAPERCONTRACT='' )bb WHERE T_SAL_RETURNNOTICE.fid=bb.FID - --begin TRAN - --UPDATE dbo.T_SAL_ORDER SET F_Amountold=b.F_SHAREAMOUNT - --FROM ( - --SELECT SUM(F_SHAREAMOUNT) F_SHAREAMOUNT ,F_ORDERNO FROM VRYF_t_Cust_Entry100021 - --GROUP BY F_ORDERNO) b - --WHERE T_SAL_ORDER.F_CONTRACTNUMBER=b.F_ORDERNO AND T_SAL_ORDER.FSaleOrgId=100302 - --COMMIT - --ROLLBACK - - - - -----SELECT 1 ,f_linshiqty=( --- UPDATE T_SAL_ORDERENTRY SET f_linshiqty=b.[发货数] --- FROM ( ---SELECT a.FENTRYID,a.FQTY,SUM([发货数]) [发货数] FROM ( ---SELECT a.FENTRYID,nn.FENTRYID AS [发货ID],a.FQTY,nn.FQty AS [发货数],cc.F_CONTRACTNUMBER,bb.F_Papercontract FROM dbo.T_SAL_ORDERENTRY A ---INNER JOIN dbo.T_SAL_DELIVERYNOTICEENTRY_LK KK ON A.FENTRYID=KK.FSID AND A.FID=KK.FSBILLID ---INNER JOIN dbo.T_SAL_DELIVERYNOTICEENTRY nn ON kk.FENTRYID=nn.FENTRYID ---INNER JOIN T_SAL_DELIVERYNOTICE bb ON nn.FID=bb.FID ---INNER JOIN dbo.T_SAL_ORDER cc ON a.FID=cc.fid ---WHERE kk.FSTABLENAME='T_SAL_ORDERENTRY' ---) a ---GROUP BY a.FENTRYID,a.FQTY ---) b ---WHERE T_SAL_ORDERENTRY.FENTRYID=b.FENTRYID \ No newline at end of file + SELECT a.F_SOURPAPERCONTRACT,a.F_sourorderno,a.F_SALEORGID,b.* FROM T_SAL_ORDER a + LEFT JOIN T_SAL_RETURNNOTICE b ON a.F_CONTRACTNUMBER=b.F_Papercontract AND b.FSALEORGID=a.FSaleOrgId + WHERE a.F_CONTRACTNUMBER='W202504240006-TH01' + + SELECT FSALEORGID,* FROM T_SAL_RETURNNOTICE + WHERE F_Papercontract='W202504240006-TH01' \ No newline at end of file diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 6a65606..38ba1af 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -118,7 +118,7 @@ SELECT A.FID [ LEFT JOIN (SELECT MAX(FAPPROVEDATE) FAPPROVEDATE,F_PAPERNUMBER,FSALEORGID FROM T_IV_SALESIC ff WITH(NOLOCK) - WHERE ff.F_PAPERNUMBER = a.F_CONTRACTNUMBER AND ff.FSALEORGID = a.FSALEORGID + WHERE ff.F_PAPERNUMBER = a.F_CONTRACTNUMBER AND ff.FSALEORGID = a.FSALEORGID and ff.F_SFQC=0 GROUP BY F_PAPERNUMBER,FSALEORGID) FP ON FP.F_PAPERNUMBER = aa.F_CONTRACTNUMBER AND FP.FSALEORGID = AA.FSALEORGID WHERE aa.FID=a.FID AND plan1.FENTRYID=w.FENTRYID ) kk @@ -242,7 +242,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE FROM T_IV_SALESIC t0 WITH(NOLOCK) INNER JOIN T_SAL_ORDER aa1 WITH(NOLOCK) ON t0.F_PAPERNUMBER=aa1.F_contractnumber AND t0.FSETTLEORGID=aa1.FSALEORGID INNER JOIN dbo.T_SAL_ORDERFIN fin ON aa1.FID=fin.FID -WHERE t0.FDATE>='2025-01-01' AND t0.FDOCUMENTSTATUS='C' +WHERE t0.F_SFQC=0 AND t0.FDOCUMENTSTATUS='C' ) tt GROUP BY F_PaperNumber, FSALEORGID ) AD ON AD.F_PaperNumber = A.F_contractnumber AND ad.FSALEORGID=a.FSALEORGID @@ -276,14 +276,24 @@ GROUP BY F_PaperNumber, FSALEORGID ---K3ֶ UPDATE T1 SET [K3ۼƷ(λ)] = T2.[ۼƷ],[K3ۼ˻(λ)] = T2.[ۼ˻] -,[K3ۼרƱ(λ)] = T2.[ۼרƱ],[K3ۼƱ(λ)] = T2.[ۼƱ] FROM [ZRP_YingShouMingXi_yuyubo] T1 INNER JOIN ( SELECT ͬ,SUM(ISNULL(,0)) AS [ۼƷ], SUM(ISNULL(˻,0)) AS [ۼ˻],SUM(ISNULL(רƱ,0)) AS [ۼרƱ],SUM(ISNULL(Ʊ,0)) AS [ۼƱ] FROM [oldk3seorder0701] GROUP BY ͬ ) T2 ON T1.ֽʺͬ = T2.ͬ -WHERE T1.֯ID = 100302 AND T1.ֽʺͬ = T2.ͬ +WHERE T1.֯ID = 100302 AND T1.ֽʺͬ = T2.ͬ; + +UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3ۼרƱ(λ)]=b.Ʊ +from oldk3ICSale0802 b +where b.Ʊ='ר' and b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302 + +UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3ۼƱ(λ)]=b.Ʊ +from oldk3ICSale0802 b +where b.Ʊ='' and b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302 + + + ---K3ϸֶ update [ZRP_YingShouMingXi_yuyubo] set diff --git a/非C#代码文件/收款单核销流水存储过程.sql b/非C#代码文件/收款单核销流水存储过程.sql index 5b99eb7..1744a12 100644 --- a/非C#代码文件/收款单核销流水存储过程.sql +++ b/非C#代码文件/收款单核销流水存储过程.sql @@ -15,10 +15,11 @@ BEGIN DELETE [ZZZ_HeXiaoBook] WHERE [ShouKuanFDate]>=@BeginDATE -DECLARE @FDATE DATETIME,@FBILLNO NVARCHAR(200),@ShouKuanFID INT,@FSALEORGID INT ,@F_contractnumber NVARCHAR(2000),@fid2 INT,@fid3 INT,@amount DECIMAL(18,2),@hexiao DECIMAL(18,2); +DECLARE @FDATE DATETIME,@FBILLNO NVARCHAR(200),@ShouKuanFID INT,@FSALEORGID INT ,@F_contractnumber NVARCHAR(2000),@fid2 INT,@fid3 INT,@amount DECIMAL(18,2),@hexiao DECIMAL(18,2) +,@remark NVARCHAR(200); -- 1. α DECLARE cursor_name2 CURSOR FOR - SELECT FDATE,FBILLNO,FID,FSALEORGID,F_contractnumber FROM T_AR_RECEIVEBILL + SELECT FDATE,FBILLNO,FID,FSALEORGID,F_contractnumber,FREMARK FROM T_AR_RECEIVEBILL WHERE FDOCUMENTSTATUS='C' AND FDATE>=@BeginDATE ORDER BY FDATE @@ -28,7 +29,7 @@ ORDER BY FDATE @FBILLNO, @ShouKuanFID, @FSALEORGID, - @F_contractnumber + @F_contractnumber,@remark WHILE @@FETCH_STATUS = 0 BEGIN SELECT @hexiao=0; @@ -50,13 +51,16 @@ ORDER BY FDATE ,[ShouKuanBillNo] ,[ShouKuanFDate] ,[BenCiHeXiao] - ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType]) + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE ,(CASE WHEN b.FALLAMOUNT220) BEGIN - SELECT @F_contractnumber=FCONTRACTNUMBER,@amount=FALLAMOUNT22 FROM VRYF_t_Cust_Entry100024 a WHERE a.FID=@fid2 + SELECT @F_contractnumber=FCONTRACTNUMBER,@amount=FALLAMOUNT22 FROM VRYF_t_Cust_Entry100024 a WHERE a.FID=@fid2 SELECT @hexiao=@amount; INSERT INTO [dbo].[ZZZ_HeXiaoBook] ([XiaoShouFid] @@ -78,8 +82,9 @@ ORDER BY FDATE ,[ShouKuanBillNo] ,[ShouKuanFDate] ,[BenCiHeXiao] - ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType]) - ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,@amount,@FSALEORGID,'֪ͨĺ¼',@fid2, dd.FExchangeRate,FSettleCurrId,FLOCALCURRID,0 FROM T_SAL_ORDER a + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) + ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,@amount,@FSALEORGID,'֪ͨĺ¼',@fid2, dd.FExchangeRate,FSettleCurrId,FLOCALCURRID,0 + ,@remark FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID WHERE a.FSALEORGID=[FSaleOrgId] and a.F_CONTRACTNUMBER=@F_contractnumber) END @@ -109,9 +114,9 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanBillNo] ,[ShouKuanFDate] ,[BenCiHeXiao] - ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType]) + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,d.FCURWRITTENOFFAMOUNTFOR,@FSALEORGID,'Ӧպ¼',@fid3 - ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 + ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_SAL_ORDER a LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID LEFT JOIN T_AR_receivable c ON c.F_PAPERPRO=a.F_CONTRACTNUMBER AND c.FSALEORGID=a.FSALEORGID @@ -135,9 +140,9 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanBillNo] ,[ShouKuanFDate] ,[BenCiHeXiao] - ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType]) + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) ( SELECT aa.fid,aa.FBILLNO,aa.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,b.FREALRECAMOUNT,@FSALEORGID,'տԴϸ',@fid2 - ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 + ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_AR_RECEIVEBILL a LEFT JOIN T_AR_RECEIVEBILLSRCENTRY b ON a.FID=b.FID LEFT JOIN dbo.T_SAL_ORDER aa ON b.FSRCBILLID=aa.FID LEFT JOIN T_SAL_ORDERFIN dd ON aa.FID=dd.FID @@ -156,8 +161,8 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN ,[ShouKuanBillNo] ,[ShouKuanFDate] ,[BenCiHeXiao] - ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType]) - ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'ʷ¼',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 + ,[FSaleOrgId],Note,NoteFid,FExchangeRate,FSettleCurrId,FLOCALCURRID,[ShouKuanType],Remark) + ( SELECT a.fid,a.FBILLNO,a.F_CONTRACTNUMBER,@ShouKuanFID,@FBILLNO,@FDATE,F_shareAmount,@FSALEORGID,'ʷ¼',c.FEntryID ,dd.FEXCHANGERATE,FSettleCurrId,FLOCALCURRID,0 ,@remark FROM T_SAL_ORDER a LEFT JOIN VRYF_t_Cust_Entry100021 c ON a.F_CONTRACTNUMBER=c.F_ORDERNO LEFT JOIN T_SAL_ORDERFIN dd ON a.FID=dd.FID @@ -170,7 +175,8 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN @FBILLNO, @ShouKuanFID, @FSALEORGID, - @F_contractnumber; + @F_contractnumber + ,@remark; END -- 4. رα @@ -178,4 +184,17 @@ LEFT JOIN dbo.T_AR_RECMACTHLOGENTRY b ON a.FID=b.FID WHERE b.FSRCBILLNO=@FBILLN -- 5. ͷαԴ DEALLOCATE cursor_name2; - END \ No newline at end of file + +--SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.ԤƵʱ,b.ʱ FROM [ZZZ_HeXiaoBook] a +--LEFT JOIN (SELECT b.۵ID,MAX(b.ԤƵʱ) AS ԤƵʱ ,max (b.ʱ) AS ʱ FROM [ZRP_YingShouMingXi_yuyubo] b GROUP BY ۵ID) b +--ON a.XiaoShouFid=b.۵ID +--ORDER BY a.XiaoShouFid + + UPDATE [ZZZ_HeXiaoBook] SET ZhangLing= ISNULL( ROUND( DATEDIFF(DAY,[ʱ],[ZZZ_HeXiaoBook].ShouKuanFDate) / 30.00,2) ,0 ) + FROM (SELECT a.XiaoShouFid,a.XiaoShouBillNo,[XiaoShouHeTong],a.ShouKuanFDate,b.ԤƵʱ,b.ʱ FROM [ZZZ_HeXiaoBook] a +LEFT JOIN (SELECT b.۵ID,MAX(b.ԤƵʱ) AS ԤƵʱ ,max (b.ʱ) AS ʱ FROM [ZRP_YingShouMingXi_yuyubo] b GROUP BY ۵ID) b +ON a.XiaoShouFid=b.۵ID) b +WHERE [ZZZ_HeXiaoBook].XiaoShouFid=b.XiaoShouFid + + END +