diff --git a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs index aec493b..4328c7f 100644 --- a/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs +++ b/Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs @@ -223,9 +223,7 @@ WHERE (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' - AND A.FBUSINESSTYPE = 'NORMAL' - + AND A.FDOCUMENTSTATUS = 'C' AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' @@ -319,11 +317,9 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表 ON G.FMATERIALID = B.FMATERIALID WHERE (D.FNUMBER IN ('CS','CW' )) - AND B.F_SPECIALOFFER = '1' + AND ( B.F_SPECIALOFFER = '1' or ABS(B2.FAllAmount_LC)< ABS(B.F_SettlementP*B.FQTY) ) AND B.F_YKQC_CHECKBOX_QTR != '1' AND A.FDOCUMENTSTATUS = 'C' - AND A.FBUSINESSTYPE = 'NORMAL' - AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1' @@ -380,9 +376,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' - + AND A.FDOCUMENTSTATUS = 'C' AND B.FQTY >= 0 AND A.FMANUALCLOSE = '0' AND A.FMANUALCLOSE <> '1'