1

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 

派诺报表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