diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index 45537ba..940e165 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -294,10 +294,10 @@ INNER JOIN ( --SELECT ͬ,SUM(ISNULL((ISNULL(۳,0)+ISNULL(,0))*˰,0)) AS [ۼƷ], SUM(ISNULL(˻,0)) AS [ۼ˻] --FROM [oldk3seorder0701] --GROUP BY ͬ - SELECT ͬ,SUM([ǿշ(ԭ)]) [ǿշ(ԭ)],SUM([k3]) [k3],SUM(ISNULL(˻,0)) AS [ۼ˻] FROM ZZV_FaHuo - GROUP BY ͬ - ) T2 ON T1.ֽʺͬ = T2.ͬ -WHERE T1.֯ID = 100302 AND T1.ֽʺͬ = T2.ͬ; + SELECT ͬ,SUM([ǿշ(ԭ)]) [ǿշ(ԭ)],SUM([k3]) [k3],SUM(ISNULL(˻,0)) AS [ۼ˻],hh.[֯ID] FROM ZZV_FaHuo hh + GROUP BY ͬ,hh.[֯ID] + ) T2 ON T1.ֽʺͬ = T2.ͬ AND T1.֯ID=t2.[֯ID] +WHERE T1.֯ID IN( 100302,100303) AND T1.ֽʺͬ = T2.ͬ AND t1.֯ID=t2.[֯ID]; UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3ۼרƱ(λ)]=b.Ʊ @@ -413,11 +413,17 @@ WHERE T0.FREDBLUE=0 AND aa1.fid= UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ԤƵʱ]= b.󷢻 FROM (SELECT ͬ,󷢻 FROM dbo.oldk3seorder0701 ) b WHERE [ԤƵʱ] IS NULL AND [ZRP_YingShouMingXi_yuyubo].ֽʺͬ=B.ͬ AND [ZRP_YingShouMingXi_yuyubo].֯ID =100302 - AND ([ZRP_YingShouMingXi_yuyubo].տ LIKE '%Э鸶%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%Ԥ%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%տ%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%Ʊտ%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%%' ) + + UPDATE [ZRP_YingShouMingXi_yuyubo] SET [ԤƵʱ]= b.󷢻 + FROM (SELECT ͬ,󷢻 FROM dbo.t_xnoldk3seorder1125 ) b + WHERE [ԤƵʱ] IS NULL AND [ZRP_YingShouMingXi_yuyubo].ֽʺͬ=B.ͬ AND [ZRP_YingShouMingXi_yuyubo].֯ID =100303 + AND ([ZRP_YingShouMingXi_yuyubo].տ LIKE '%Э鸶%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%Ԥ%' + OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%տ%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%Ʊտ%' OR [ZRP_YingShouMingXi_yuyubo].տ LIKE '%%' + ) update [ZRP_YingShouMingXi_yuyubo] SET [δڽ]=CASE WHEN ([տ] LIKE '%' OR [տ] LIKE '%' OR [տ] LIKE 'Э鸶%') AND [ܶ]>0 THEN ([ۼƷ]+ISNULL([K3ۼƷ(λ)],0)/-[ۼ˻]-[K3ۼ˻(λ)]/)*[̯]*0.01*[տ̯]*0.01 - [տۼƺ]*[̯]*0.01+[ӷ] diff --git a/非C#代码文件/派诺合同明细存储过程.sql b/非C#代码文件/派诺合同明细存储过程.sql index 49d9521..d4756f3 100644 --- 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 'ܶ' , 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([ǿշ],0)+ISNULL([k3],0) FROM [ZZV_FaHuo] WHERE ۶FENTRYID = B.FENTRYID) + ELSE null END AS 'ѽ', --ѽ -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([ǿշ],0)+ISNULL([k3],0) + FROM [ZZV_FaHuo] WHERE ۶FENTRYID = B.FENTRYID) ELSE NULL END AS 'δ', --δ