Develop/Piolot_RepotForm_PeiHao
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
Pilot.Report.Exploitation/SpecialDetails/SpecialDetailsReport.cs
View File

@@ -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'