diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index dfb875d..0c7cd40 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -265,7 +265,8 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表 --ES、W、SX、CW、D、CY WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C','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 (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr > c.FBillAllAmount OR a.F_ManuallySpecialPrices ='是' ) + AND (a.F_ManuallySpecialPrices !='否' or a.F_CancelSpecialContracts ='' ) AND B.FQTY >= 0 AND A.FDOCUMENTSTATUS = 'C' AND A.FBUSINESSTYPE = 'NORMAL' @@ -396,7 +397,8 @@ 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_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null ) + AND (A.F_SpecialContracts = '是' OR a.F_GROSSMARGIN1='<35%') and (a.F_CancelSpecialContracts !='是' or a.F_CancelSpecialContracts is null or a.F_ManuallySpecialPrices='是' ) + AND (a.F_ManuallySpecialPrices !='否' or a.F_CancelSpecialContracts ='' ) AND A.FDOCUMENTSTATUS = 'C' AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0'