This commit is contained in:
2025-08-08 20:29:55 +08:00
parent a6df28ad29
commit 8ec9a7fbdb
3 changed files with 13 additions and 12 deletions

View File

@@ -55,7 +55,7 @@ FROM T_SAL_ORDERENTRY B --
) D --<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>#<23><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD>
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
--ES<EFBFBD><EFBFBD>W<EFBFBD><EFBFBD>SX<EFBFBD><EFBFBD>CW<EFBFBD><EFBFBD>D<EFBFBD><EFBFBD>CY
WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' )
AND (A.F_SpecialContracts = '<EFBFBD><EFBFBD>' 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 = '<EFBFBD><EFBFBD>' OR a.F_GROSSMARGIN1='<35%' OR a.F_VRYF_Amount_yrr> c.FBillAllAmount_LC ) AND a.F_CancelSpecialContracts !='<EFBFBD><EFBFBD>'
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 = '<EFBFBD><EFBFBD>' OR a.F_GROSSMARGIN1='<35%')
AND (a.F_CancelSpecialContracts !='<EFBFBD><EFBFBD>' or a.F_CancelSpecialContracts is null )
AND A.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL'