发货数量增加兴诺的K3数据

2025-11-28 15:15:09 +08:00
parent 19b98af9ff
commit 0dfec1b78f
2 changed files with 16 additions and 8 deletions
--- a/非C#代码文件/应收明细SQL.sql
+++ b/非C#代码文件/应收明细SQL.sql
@@ -294,10 +294,10 @@ INNER JOIN (
 	--SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,SUM(ISNULL((ISNULL(<EFBFBD><EFBFBD><EFBFBD>۳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)+ISNULL(<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0))*<EFBFBD><EFBFBD>˰<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) AS [<EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD>], SUM(ISNULL(<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) AS [<EFBFBD>ۼ<EFBFBD><EFBFBD>˻<EFBFBD>]
 	--FROM [oldk3seorder0701]
 	--GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>
-	SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,SUM([<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(ԭ<EFBFBD><EFBFBD>)]) [<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><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(ISNULL(<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) AS [<EFBFBD>ۼ<EFBFBD><EFBFBD>˻<EFBFBD>] FROM ZZV_FaHuo 
-    GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>
-	) T2 ON T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>
-WHERE T1.<EFBFBD><EFBFBD>֯ID = 100302 AND T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>;
+	SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,SUM([<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(ԭ<EFBFBD><EFBFBD>)]) [<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><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(ISNULL(<EFBFBD>˻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,0)) AS [<EFBFBD>ۼ<EFBFBD><EFBFBD>˻<EFBFBD>],hh.[<EFBFBD><EFBFBD>֯ID] FROM ZZV_FaHuo hh
+    GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,hh.[<EFBFBD><EFBFBD>֯ID]
+	) T2 ON T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND T1.<EFBFBD><EFBFBD>֯ID=t2.[<EFBFBD><EFBFBD>֯ID]
+WHERE T1.<EFBFBD><EFBFBD>֯ID IN( 100302,100303) AND T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND t1.<EFBFBD><EFBFBD>֯ID=t2.[<EFBFBD><EFBFBD>֯ID];


 UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)]=b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -413,11 +413,17 @@ WHERE T0.FREDBLUE=0   AND aa1.fid=
   UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [Ԥ<EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>]= b.<EFBFBD><EFBFBD><EFBFBD>󷢻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
   FROM (SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD>󷢻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM dbo.oldk3seorder0701 ) b
   WHERE [Ԥ<EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>] IS  NULL AND [ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>=B.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID =100302
-
   AND ([ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE   '%Э<>鸶<EFBFBD><E9B8B6>%'  OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE '%Ԥ<><D4A4><EFBFBD><EFBFBD>%'
     OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  LIKE '%<25><><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD>%'     OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  LIKE '%<25><><EFBFBD><EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD>տ<EFBFBD>%' OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE '%<25><EFBFBD><EEB5BD><EFBFBD><EFBFBD>%'
 	 ) 

+ 
+   UPDATE  [ZRP_YingShouMingXi_yuyubo] SET [Ԥ<EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>]= b.<EFBFBD><EFBFBD><EFBFBD>󷢻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+   FROM (SELECT <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD>󷢻<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> FROM dbo.t_xnoldk3seorder1125 ) b
+   WHERE [Ԥ<EFBFBD>Ƶ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>] IS  NULL AND [ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD>=B.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> AND [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID =100303
+   AND ([ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE   '%Э<>鸶<EFBFBD><E9B8B6>%'  OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE '%Ԥ<><D4A4><EFBFBD><EFBFBD>%'
+     OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  LIKE '%<25><><EFBFBD><EFBFBD><EFBFBD>տ<EFBFBD>%'     OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  LIKE '%<25><><EFBFBD><EFBFBD>Ʊ<EFBFBD><C6B1><EFBFBD>տ<EFBFBD>%' OR [ZRP_YingShouMingXi_yuyubo].<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LIKE '%<25><EFBFBD><EEB5BD><EFBFBD><EFBFBD>%'
+	 ) 

 update [ZRP_YingShouMingXi_yuyubo] SET [δ<EFBFBD><EFBFBD><EFBFBD>ڽ<EFBFBD><EFBFBD><EFBFBD>]=CASE WHEN  ([<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] LIKE '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>%'  OR  [<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] LIKE '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%'  OR  [<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] LIKE 'Э<EFBFBD>鸶<EFBFBD><EFBFBD>%') AND [<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>]>0
 THEN ([<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]+ISNULL([K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)],0)/<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-[<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD><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>]*0.01*[<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]*0.01 - [<EFBFBD>տ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]*[<EFBFBD><EFBFBD>̯<EFBFBD><EFBFBD><EFBFBD><EFBFBD>]*0.01+[<EFBFBD><EFBFBD><EFBFBD>ӷ<EFBFBD>] 
--- a/非C#代码文件/派诺合同明细存储过程.sql
+++ b/非C#代码文件/派诺合同明细存储过程.sql
@@ -115,11 +115,13 @@ CASE WHEN n.FSHARERATE IS NULL THEN ROUND(BB.FALLAMOUNT_LC,2)
  THEN CAST(j.FBILLALLAMOUNT_LC AS NUMERIC(18,2)) ELSE NULL END AS '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܶ<EFBFBD>'  , 

 CASE                       
-                WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1 THEN (SELECT FStockOutQty FROM T_SAL_ORDERENTRY_R WHERE FENTRYID = B.FENTRYID)                 
-                ELSE NULL                       
+                WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1
+				THEN (SELECT ISNULL([<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],0)+ISNULL([k3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],0) FROM [ZZV_FaHuo] WHERE <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID = B.FENTRYID)          
+                ELSE null                       
            END                      
 			 AS '<EFBFBD>ѽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', --<EFBFBD>ѽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>    
-CASE     WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1 THEN  B.FQty-(SELECT FStockOutQty FROM T_SAL_ORDERENTRY_R WHERE FENTRYID = B.FENTRYID)              
+CASE     WHEN ROW_NUMBER() OVER (PARTITION BY A.FID, B.FENTRYID ORDER BY N.FENTRYID) = 1 THEN  B.FQty-(SELECT ISNULL([<EFBFBD><EFBFBD><EFBFBD>ǿշ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],0)+ISNULL([k3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>],0)
+ FROM [ZZV_FaHuo] WHERE <EFBFBD><EFBFBD><EFBFBD>۶<EFBFBD><EFBFBD><EFBFBD>FENTRYID = B.FENTRYID)              
        ELSE NULL                       
          END      
 AS 'δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', --δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>