diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 7b1cf6d..f692138 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -91,9 +91,9 @@ SELECT A.FID [ SELECT plan1.FID ,CASE WHEN X.FNAME LIKE '%Э鸶%' THEN NULL WHEN X.FNAME LIKE '%Ԥ%' THEN CONVERT(NVARCHAR(20), AA.FAPPROVEDATE, 120) - WHEN X.FNAME LIKE '%տ%' THEN DATEADD(DAY, plan1.F_DAY,ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck.FDATE)) + WHEN X.FNAME LIKE '%տ%' THEN DATEADD(DAY, plan1.F_DAY,ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck2.FDATE)) WHEN X.FNAME LIKE '%Ʊտ%' THEN DATEADD(DAY, plan1.F_DAY,FP.FAPPROVEDATE) - WHEN X.FNAME LIKE '%%' THEN DATEADD(DAY, plan1.F_DAY, ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck.FDATE)) + WHEN X.FNAME LIKE '%%' THEN DATEADD(DAY, plan1.F_DAY, ISNULL( ISNULL( CK.F_SFSIGNATURETIME,F_SigningTime),ck2.FDATE)) WHEN X.FNAME LIKE '%ʱ%' THEN DATEADD(DAY, plan1.F_DAY,AA.F_XMYSSJ) WHEN (X.FNAME LIKE '%%' OR X.FNAME LIKE '%Ŀ%') THEN DATEADD(DAY,ISNULL(plan1.F_DAY,0), AA.F_XMYSSJ) @@ -114,7 +114,12 @@ SELECT A.FID [ WHERE F_CONTRACTNUMBER = a.F_CONTRACTNUMBER AND FSALEORGID = a.FSALEORGID GROUP BY F_CONTRACTNUMBER,FSALEORGID ) CK - ON CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --۳ⵥ + ON CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --۳ⵥ + LEFT JOIN + (SELECT F_Papercontract,FSALEORGID,MAX(FDATE) AS FDATE + FROM T_SAL_DELIVERYNOTICE WITH(NOLOCK) + WHERE F_Papercontract = a.F_CONTRACTNUMBER AND FSALEORGID = a.FSALEORGID + GROUP BY F_Papercontract,FSALEORGID ) ck2 ON CK.F_CONTRACTNUMBER = aa.F_CONTRACTNUMBER AND CK.FSALEORGID = AA.FSALEORGID --֪ͨ LEFT JOIN (SELECT MAX(FAPPROVEDATE) FAPPROVEDATE,F_PAPERNUMBER,FSALEORGID FROM T_IV_SALESIC ff WITH(NOLOCK)