1

2025-08-06 21:49:47 +08:00
parent 827cbdd1f7
commit 892d5d36c6
5 changed files with 39 additions and 16 deletions
--- a/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
+++ b/派诺报表SQL文件/应收对账单明细更新发票金额存储过程.sql
@@ -1,5 +1,4 @@
-USE [AIS20250723115352]
-GO
+
 /****** Object:  StoredProcedure [dbo].[GXFPJEYSDZDMX_GZTH]    Script Date: 2025/8/2 10:22:54 ******/
 SET ANSI_NULLS ON
 GO
@@ -231,7 +230,7 @@ WHERE B.FPLX = 'רƱ' AND A.[
  WHERE PPBillingAmount = 0         
    
 	UPDATE YingShouZhanKuanMX_GZTH
-	 SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = ''
+	 SET OrderAmount=0,PaymentAmount=0,ShippedDebt=0,InvoicedDebt=0,IsEnded = NULL	,OwedTickets= 0,BillingAmount=0,PPBillingAmount=0,ZPBillingAmount=0,ZPBillingDate='',PPBillingDate='',PaymentDate = '',ShipmentsDate = ''
 	from (
 		 SELECT   CASE WHEN ROW_NUMBER() OVER(PARTITION BY FBILLNO ORDER BY fid) = 1 THEN FBILLNO 
       END AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,* FROM YingShouZhanKuanMX_GZTH
--- a/派诺报表SQL文件/应收对账表(明细创建).sql
+++ b/派诺报表SQL文件/应收对账表(明细创建).sql
@@ -1,6 +1,4 @@
-USE [AIS20250723115352]
-GO
-/****** Object:  StoredProcedure [dbo].[UpdateYSDZBMX_GZTH]    Script Date: 2025/8/2 10:16:20 ******/
+
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
@@ -142,7 +140,7 @@ UPDATE  a
 SET a.[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	 
 FROM YingShouZhanKuanMX_GZTH A
 INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 
-INNER JOIN [oldk3ICSale0802] b 
+INNER JOIN (SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,SUM(<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) AS '<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' FROM [oldk3ICSale0802] GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) b 
 ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> --AND a.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>=[<EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>] AND a.FQty=[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] AND (ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD>˰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02 OR ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02)
 WHERE  <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=0 
 AND b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = 'ר'
@@ -154,7 +152,7 @@ UPDATE  a
 SET a.[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] = b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 FROM YingShouZhanKuanMX_GZTH A
 INNER JOIN T_SAL_ORDERENTRY C ON A.FENTRYID = C.FENTRYID 
-INNER JOIN [oldk3ICSale0802] b 
+INNER JOIN (SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,SUM(<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) AS '<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' FROM [oldk3ICSale0802] GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) b 
 ON C.FSEQ = 1 AND a.CONTRACTNUMBER=b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> --AND a.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>=[<EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><EFBFBD><EFBFBD>] AND a.FQty=[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] AND (ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD>˰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02 OR ABS(a.FTaxPrice-b.[<EFBFBD><EFBFBD><EFBFBD><EFBFBD>])<=0.02)
 WHERE  <EFBFBD>Ƿ<EFBFBD>K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=0 
 AND b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD>'
@@ -209,7 +207,12 @@ INNER JOIN (
 ,C.FSID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID                
 ,A.FApproveDate AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
 ,B.FQTY AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
- ,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
+ ,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+  ,STUFF((SELECT DISTINCT ','+FORMAT(FApproveDate,'yyyy-MM-dd')  FROM T_SAL_DELIVERYNOTICE T1                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY T2 ON T1.FID = T2.FID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F T3 ON T2.FENTRYID = T3.FENTRYID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK T4 ON T3.FENTRYID = T4.FENTRYID AND T4.FSTABLENAME = 'T_SAL_ORDERENTRY'                
+ WHERE T4.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND C.FSBILLID = T4.FSBILLID FOR XML PATH('')),1,1,'') AS <EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>               
 INTO #TEMP1                
 FROM T_SAL_DELIVERYNOTICE A                
 LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
@@ -238,7 +241,7 @@ INNER JOIN (
 GROUP BY <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID,<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID            
                    
 UPDATE A                
- SET ShipmentsDate = FORMAT( B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'yyyy-MM-dd')              
+ SET ShipmentsDate = B.<EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --FORMAT( B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'yyyy-MM-dd')              
 FROM YingShouZhanKuanMX_GZTH A                 
 INNER JOIN #TEMP1 B ON A.FID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID AND A.FENTRYID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID              
             
--- a/派诺报表SQL文件/应收对账表(明细版存储过程).sql
+++ b/派诺报表SQL文件/应收对账表(明细版存储过程).sql
@@ -202,7 +202,12 @@ INNER JOIN (
 ,C.FSID AS <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID                
 ,A.FApproveDate AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
 ,B.FQTY AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
- ,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>                
+ ,B_F.FAllAmount_LC AS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+  ,STUFF((SELECT DISTINCT ','+FORMAT(FApproveDate,'yyyy-MM-dd')  FROM T_SAL_DELIVERYNOTICE T1                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY T2 ON T1.FID = T2.FID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_F T3 ON T2.FENTRYID = T3.FENTRYID                
+ LEFT JOIN T_SAL_DELIVERYNOTICEENTRY_LK T4 ON T3.FENTRYID = T4.FENTRYID AND T4.FSTABLENAME = 'T_SAL_ORDERENTRY'                
+ WHERE T4.FSBILLID IN (SELECT FID FROM YingShouZhanKuanMX_GZTH) AND C.FSBILLID = T4.FSBILLID FOR XML PATH('')),1,1,'') AS <EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>               
 INTO #TEMP1                
 FROM T_SAL_DELIVERYNOTICE A                
 LEFT JOIN T_SAL_DELIVERYNOTICEENTRY B ON A.FID = B.FID                
@@ -231,7 +236,7 @@ INNER JOIN (
 GROUP BY <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FID,<EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID            
                    
 UPDATE A                
- SET ShipmentsDate = FORMAT( B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'yyyy-MM-dd')              
+ SET ShipmentsDate = B.<EFBFBD>ϲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --FORMAT( B.<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,'yyyy-MM-dd')              
 FROM YingShouZhanKuanMX_GZTH A                 
 INNER JOIN #TEMP1 B ON A.FID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FID AND A.FENTRYID = B.<2E><><EFBFBD>۶<EFBFBD><DBB6><EFBFBD>FENTRYID              
             
--- a/派诺报表SQL文件/应收对账表(简易)更新数据.sql
+++ b/派诺报表SQL文件/应收对账表(简易)更新数据.sql
@@ -4,9 +4,12 @@ BEGIN
          
 TRUNCATE TABLE YingShouZhanKuanJY_GZTH          
          
-INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],ZPFALLAmountFor,PPFALLAmountFor)          
+INSERT INTO YingShouZhanKuanJY_GZTH(FID,FSaleOrgId,FSalerId,[DATE],ContractNumber,ProjectName,OrderAmount,FALLAmountFor,PaymentAmount,ShippedDebt,InvoicedDebt,OwedTickets,IsEnded,Remark,[K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],ZPFALLAmountFor,PPFALLAmountFor
+,[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],[K3<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>],ShipmentsAmount,FBillAllAmount)          
 SELECT FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,SUM(OrderAmount) OrderAmount,SUM(BillingAmount) BillingAmount,SUM(PaymentAmount) PaymentAmount,SUM(ShippedDebt) ShippedDebt
-,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(ZPBillingAmount) [רƱ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(PPBillingAmount) [<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]      
+,SUM(InvoicedDebt) InvoicedDebt,SUM(OwedTickets) OwedTickets,null,Remark,SUM([K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(ZPBillingAmount) [רƱ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM(PPBillingAmount) [<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>] 
+,SUM([K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [K3<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [<EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([<EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [<EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],SUM([<EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]) [<EFBFBD>ǿ<EFBFBD><EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] 
+,SUM(ShipmentsAmount) <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,SUM(ReturnAmount) <EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>   
 FROM YingShouZhanKuanMX_GZTH  
 WHERE Number <> '<EFBFBD>ϼ<EFBFBD>' OR Number IS NULL
 GROUP BY FID,FSaleOrgId,FSalerId,[Date],CONTRACTNUMBER,ProjectName,Remark