From 8ec9a7fbdbbd24237d6e91491cbd981c71b6b5db Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Fri, 8 Aug 2025 20:29:55 +0800 Subject: [PATCH] 111 --- .../SpecialDetails/SpecialDetailsReport.cs | 8 ++++---- 非C#代码文件/应收明细SQL.sql | 10 +++++----- 非C#代码文件/特价明细表SQL22.sql | 7 ++++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index 7339b3a..08ab818 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -217,7 +217,7 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表 ) D --合同类型#（辅助资料表） ON A.F_ORDERCATEGORY = D.FMASTERID WHERE - (D.FNUMBER IN ( 'P', 'E', 'C', 'S' )) + (D.FNUMBER IN ( 'P', 'E', 'C', 'S','B' )) AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP) AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' @@ -261,8 +261,8 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表 ON A.F_ORDERCATEGORY = D.FMASTERID --ES、W、SX、CW、D、CY -WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' ) - AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr > c.FBillAllAmount ) +WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW','B' ) + AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr > c.FBillAllAmount ) AND (a.F_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null ) AND B.FQTY >= 0 AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' @@ -376,7 +376,7 @@ WHERE (D.FNUMBER IN ('CS','CW' )) --AND B.F_SPECIALOFFER = '1' --AND B.F_YKQC_CHECKBOX_QTR != '1' - AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%') + AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%') and (a.F_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null ) AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' diff --git a/非C#代码文件/应收明细SQL.sql b/非C#代码文件/应收明细SQL.sql index d449af0..1cdbbb8 100644 --- a/非C#代码文件/应收明细SQL.sql +++ b/非C#代码文件/应收明细SQL.sql @@ -237,7 +237,7 @@ WHERE aa.FCreditStatus='A' AND aa.FRowAuditStatus='A' AND bb.FNUMBER=Cccc.FNUMBE SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS 'Ʊܽ' FROM ( SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId ,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FALLAMOUNTFOR - WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR + WHEN F_ORDERCATEGORY !='67283ced82f38d' AND F_GENERALINVOICE='Y' and FALLAMOUNTFOR >0 THEN 0 ELSE FALLAMOUNTFOR END AS FAFTERTOTALTAXFOR --FAFTERTOTALTAX FROM ( @@ -292,12 +292,12 @@ INNER JOIN ( WHERE T1.֯ID = 100302 AND T1.ֽʺͬ = T2.ͬ; UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3ۼרƱ(λ)]=b.Ʊ -from oldk3ICSale0802 b -where b.Ʊ='ר' and b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302 +FROM (SELECT SUM(Ʊ) Ʊ ,ͬ FROM oldk3ICSale0802 b WHERE b.Ʊ='ר' GROUP BY ͬ) b +where b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302 UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3ۼƱ(λ)]=b.Ʊ -from oldk3ICSale0802 b -where b.Ʊ='' and b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302 +from (SELECT SUM(Ʊ) Ʊ ,ͬ FROM oldk3ICSale0802 b WHERE b.Ʊ='' GROUP BY ͬ) b +where b.ͬ=[ZRP_YingShouMingXi_yuyubo].ֽʺͬ and [ZRP_YingShouMingXi_yuyubo].֯ID = 100302; diff --git a/非C#代码文件/特价明细表SQL22.sql b/非C#代码文件/特价明细表SQL22.sql index 6c89bc7..15db3d1 100644 --- a/非C#代码文件/特价明细表SQL22.sql +++ b/非C#代码文件/特价明细表SQL22.sql @@ -55,7 +55,7 @@ FROM T_SAL_ORDERENTRY B -- ) D --ͬ#ϱ ON A.F_ORDERCATEGORY = D.FMASTERID WHERE - (D.FNUMBER IN ( 'P', 'E', 'C', 'S' )) + (D.FNUMBER IN ( 'P', 'E', 'C', 'S','B' )) AND (B.F_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP) AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' @@ -101,8 +101,8 @@ FROM T_SAL_ORDERENTRY B -- ON A.F_ORDERCATEGORY = D.FMASTERID --ESWSXCWDCY -WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' ) - AND (A.F_SpecialContracts = '' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr> c.FBillAllAmount ) +WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW','B' ) + AND (A.F_SpecialContracts = '' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr> c.FBillAllAmount_LC ) AND a.F_CancelSpecialContracts !='' AND B.FQTY >= 0 AND A.FDOCUMENTSTATUS = 'C' @@ -221,6 +221,7 @@ WHERE --AND B.F_SPECIALOFFER = '1' --AND B.F_YKQC_CHECKBOX_QTR != '1' AND (A.F_SpecialContracts = '' OR a.F_GROSSMARGIN1='<35%') + AND (a.F_CancelSpecialContracts !='' or a.F_CancelSpecialContracts is null ) AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL'