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
Show Stats 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'

10
非C#代码文件/应收明细SQL.sql
View File

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

7
非C#代码文件/特价明细表SQL22.sql
View File

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