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

@@ -217,7 +217,7 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
) D --合同类型#(辅助资料表) ) D --合同类型#(辅助资料表)
ON A.F_ORDERCATEGORY = D.FMASTERID ON A.F_ORDERCATEGORY = D.FMASTERID
WHERE 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_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP)
AND B.F_YKQC_CHECKBOX_QTR != '1' AND B.F_YKQC_CHECKBOX_QTR != '1'
AND A.FDOCUMENTSTATUS = 'C' AND A.FDOCUMENTSTATUS = 'C'
@@ -261,8 +261,8 @@ FROM T_SAL_ORDERENTRY B --销售订单明细表
ON A.F_ORDERCATEGORY = D.FMASTERID ON A.F_ORDERCATEGORY = D.FMASTERID
--ES、W、SX、CW、D、CY --ES、W、SX、CW、D、CY
WHERE D.FNUMBER NOT IN ( 'P', 'E', 'C', 'S','CS','CW' ) 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_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 B.FQTY >= 0
AND A.FDOCUMENTSTATUS = 'C' AND A.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL' AND A.FBUSINESSTYPE = 'NORMAL'
@@ -376,7 +376,7 @@ WHERE
(D.FNUMBER IN ('CS','CW' )) (D.FNUMBER IN ('CS','CW' ))
--AND B.F_SPECIALOFFER = '1' --AND B.F_SPECIALOFFER = '1'
--AND B.F_YKQC_CHECKBOX_QTR != '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.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL' AND A.FBUSINESSTYPE = 'NORMAL'

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 '<EFBFBD><EFBFBD>Ʊ<EFBFBD>ܽ<EFBFBD><EFBFBD><EFBFBD>' FROM ( SELECT F_PaperNumber, FSALEORGID ,SUM(FAFTERTOTALTAXFOR) AS '<EFBFBD><EFBFBD>Ʊ<EFBFBD>ܽ<EFBFBD><EFBFBD><EFBFBD>' FROM (
SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId SELECT F_PaperNumber, t0.FSALEORGID,t0.FCURRENCYID,fin.FSettleCurrId
,CASE WHEN F_ORDERCATEGORY ='67283ced82f38d' THEN FALLAMOUNTFOR ,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 --FAFTERTOTALTAX
FROM FROM
( (
@@ -292,12 +292,12 @@ INNER JOIN (
WHERE T1.<EFBFBD><EFBFBD>֯ID = 100302 AND T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>; WHERE T1.<EFBFBD><EFBFBD>֯ID = 100302 AND T1.ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> = T2.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>;
UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)]=b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD>רƱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)]=b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
from oldk3ICSale0802 b FROM (SELECT SUM(<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> FROM oldk3ICSale0802 b WHERE b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>='ר' GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>) b
where b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>='ר' and b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>=[ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> and [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID = 100302 where b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>=[ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> and [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID = 100302
UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)]=b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> UPDATE [ZRP_YingShouMingXi_yuyubo] set [K3<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD><EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD>)]=b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
from oldk3ICSale0802 b from (SELECT SUM(<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ,<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD> FROM oldk3ICSale0802 b WHERE b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>='<EFBFBD><EFBFBD>' GROUP BY <EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>) b
where b.<EFBFBD><EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>='<EFBFBD><EFBFBD>' and b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>=[ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> and [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID = 100302 where b.<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD>=[ZRP_YingShouMingXi_yuyubo].ֽ<EFBFBD>ʺ<EFBFBD>ͬ<EFBFBD><EFBFBD> and [ZRP_YingShouMingXi_yuyubo].<EFBFBD><EFBFBD>֯ID = 100302;

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> ) D --<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>#<23><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϱ<EFBFBD><CFB1><EFBFBD>
ON A.F_ORDERCATEGORY = D.FMASTERID ON A.F_ORDERCATEGORY = D.FMASTERID
WHERE 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_SPECIALOFFER = '1' OR B2.FTaxPrice*fin.FExchangeRate < B.F_SettlementP)
AND B.F_YKQC_CHECKBOX_QTR != '1' AND B.F_YKQC_CHECKBOX_QTR != '1'
AND A.FDOCUMENTSTATUS = 'C' AND A.FDOCUMENTSTATUS = 'C'
@@ -101,8 +101,8 @@ FROM T_SAL_ORDERENTRY B --
ON A.F_ORDERCATEGORY = D.FMASTERID ON A.F_ORDERCATEGORY = D.FMASTERID
--ES<EFBFBD><EFBFBD>W<EFBFBD><EFBFBD>SX<EFBFBD><EFBFBD>CW<EFBFBD><EFBFBD>D<EFBFBD><EFBFBD>CY --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' ) 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 ) 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 B.FQTY >= 0
AND A.FDOCUMENTSTATUS = 'C' AND A.FDOCUMENTSTATUS = 'C'
@@ -221,6 +221,7 @@ WHERE
--AND B.F_SPECIALOFFER = '1' --AND B.F_SPECIALOFFER = '1'
--AND B.F_YKQC_CHECKBOX_QTR != '1' --AND B.F_YKQC_CHECKBOX_QTR != '1'
AND (A.F_SpecialContracts = '<EFBFBD><EFBFBD>' OR a.F_GROSSMARGIN1='<35%') 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.FDOCUMENTSTATUS = 'C'
AND A.FBUSINESSTYPE = 'NORMAL' AND A.FBUSINESSTYPE = 'NORMAL'