diff --git a/HKBaoBiao/回款报表服务器插件.py b/HKBaoBiao/回款报表服务器插件.py index 046a812..245d227 100644 --- a/HKBaoBiao/回款报表服务器插件.py +++ b/HKBaoBiao/回款报表服务器插件.py @@ -303,11 +303,11 @@ def BuilderReportSqlAndTempTable(Filter,tableName): /*±עֶ*/ UPDATE T1 SET ע = T2.㷽ʽ +ע FROM #TEMP3 T1 INNER JOIN #TEMP2 T2 ON T1.ShouKuanFid = T2.FID - WHERE T2.㷽ʽ <> '' + WHERE T2.㷽ʽ <> '' AND T1. = 1 /*տ*/ UPDATE T1 SET = T2.տ FROM #TEMP3 T1 - INNER JOIN #TEMP2 T2 ON T1.ShouKuanFid = T2.FID + INNER JOIN #TEMP2 T2 ON T1.ShouKuanFid = T2.FID AND T1. = 1 /*¸λֶ*/ UPDATE A SET = T2.λ FROM #TEMP3 A @@ -317,7 +317,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName): LEFT JOIN T_AR_RECEIVEBILLENTRY B ON A.FID = B.FID LEFT JOIN T_BD_CUSTOMER_L C ON A.FPAYUNITTYPE = 'BD_Customer' AND A.FPAYUNIT = C.FCUSTID AND C.FLOCALEID = 2052 ) T2 ON A.ShouKuanFid = T2.FID - WHERE ̯ = 1 + WHERE ̯ = 1 AND A. = 1 /*±ұֶ*/ @@ -327,7 +327,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName): FROM T_AR_RECEIVEBILL A LEFT JOIN T_AR_RECEIVEBILLENTRY B ON A.FID = B.FID LEFT JOIN T_BD_CURRENCY_L D ON D.FCURRENCYID = A.FCURRENCYID AND D.FLOCALEID = 2052 - ) T2 ON A.ShouKuanFid = T2.FID + ) T2 ON A.ShouKuanFid = T2.FID AND A. = 1 --/*´ֶͬ*/ @@ -338,12 +338,12 @@ def BuilderReportSqlAndTempTable(Filter,tableName): /*ֻ·̯Ϊ1տֶ*/ UPDATE T1 SET = T2.տ FROM #TEMP3 T1 INNER JOIN #TEMP2 T2 ON T1.ShouKuanFid = T2.FID - WHERE T1.̯ = 1 + WHERE T1.̯ = 1 AND T1. = 1 /*µڣУֶ*/ UPDATE T1 SET = T2. FROM #TEMP3 T1 INNER JOIN #TEMP2 T2 ON T1.ShouKuanFid = T2.FID - WHERE T2.㷽ʽ IN ('гжһƱ','ҵжһƱ') + WHERE T2.㷽ʽ IN ('гжһƱ','ҵжһƱ') AND T1. = 1 /*SBUϸֶ*/ UPDATE #TEMP3 SET SBU=b.,[ϸ]=b.ϸ @@ -357,7 +357,7 @@ def BuilderReportSqlAndTempTable(Filter,tableName): /*̯β*/ UPDATE T1 SET ̯ = ISNULL(T1.̯,0)+(ISNULL(T1.,0)-ISNULL(T2.̯,0)) FROM #TEMP3 T1 INNER JOIN(SELECT ShouKuanFid,SUM(ISNULL(̯,0)) ̯ FROM #TEMP3 GROUP BY ShouKuanFid) T2 ON T1.ShouKuanFid = T2.ShouKuanFid - WHERE T1.̯ = 1 AND T1.>0 + WHERE T1.̯ = 1 AND T1.>0 AND T1. = 1 /*ֶ*/ UPDATE #TEMP3 SET diff --git a/派诺报表SQL文件/应收对账表(明细版存储过程).sql b/派诺报表SQL文件/应收对账表(明细版存储过程).sql index a7cd173..edb6f58 100644 --- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql +++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql @@ -263,9 +263,9 @@ INNER JOIN ( SET ShipmentsDate = LEFT(CONCAT(CASE WHEN ISNULL(A.ShipmentsDate,'') = '' THEN '' ELSE A.ShipmentsDate+',' END ,B.ϲ),1990) FROM YingShouZhanKuanMX_GZTH A INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID - INNER JOIN (SELECT к,STUFF((SELECT DISTINCT ','+ FROM oldk3seorder0701 WHERE ݱ = a.ݱ FOR XML PATH('')),1,1,'') AS 'ϲ',ݱ + INNER JOIN (SELECT к,STUFF((SELECT DISTINCT ','+ FROM oldk3seorder0701 WHERE ͬ = a.ͬ FOR XML PATH('')),1,1,'') AS 'ϲ',ͬ from oldk3seorder0701 a) b - ON C.F_K3SEQ = b.к AND a.FBILLNO=b.[ݱ] + ON C.F_K3SEQ = b.к AND a.CONTRACTNUMBER=b.[ͬ] UPDATE A SET A.ǿշ = B.,A.ǿշ = B. @@ -283,7 +283,7 @@ SET a.[K3 FROM YingShouZhanKuanMX_GZTH A INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID INNER JOIN [oldk3seorder0701] b -ON C.F_K3SEQ = b.к AND a.FBILLNO=b.[ݱ] +ON C.F_K3SEQ = b.к AND a.CONTRACTNUMBER=b.[ͬ] WHERE ǷK3=0 AND B. >= @StartDate AND B. < @EndDate @@ -316,6 +316,29 @@ AND B. AND A.FApproveDate < @EndDate AND A.FDOCUMENTSTATUS = 'C' + --˻ڣ˻˻ Դ + INSERT INTO #TEMP2 (۶FID,۶FENTRYID,˻,˻,˻,ֽʺͬ) + SELECT + F.FID AS ۶FID + ,D.FENTRYID AS ۶FENTRYID + ,A.FDATE AS ˻ + ,B.FQTY AS ˻ + ,B_F.FALLAMOUNT_LC AS ˻ + ,F.F_CONTRACTNUMBER AS ֽʺͬ + FROM T_SAL_RETURNNOTICE A + INNER JOIN T_SAL_RETURNNOTICEENTRY B ON A.FID = B.FID + INNER JOIN T_SAL_RETURNNOTICEENTRY_F B_F ON B.FENTRYID = B_F.FENTRYID + INNER JOIN T_SAL_RETURNNOTICEENTRY_LK C ON B_F.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' + INNER JOIN T_SAL_ORDERENTRY D ON C.FSBILLID = D.FID AND C.FSID = D.FENTRYID + INNER JOIN T_SAL_ORDER F ON D.FID = F.FID + WHERE 1=1 + AND D.FRETURNTYPE <> 'RETURN' + AND D.FRETURNTYPE <> 'SEND' + AND F.F_CONTRACTNUMBER NOT IN (SELECT DISTINCT [ֽʺͬ] FROM #TEMP2) + AND A.FApproveDate >= @StartDate + AND A.FApproveDate < @EndDate + AND A.FDOCUMENTSTATUS = 'C' + --˻ڣ˻˻ Դ INSERT INTO #TEMP2 (۶FID,۶FENTRYID,˻,˻,˻,ֽʺͬ) SELECT