Compare commits

..

2 Commits

Author SHA1 Message Date
a81583fe4b Merge branch 'main' of http://8.130.121.29:3000/TianHua/PiolotTH_ReportFrom into main 2025-08-28 14:30:37 +08:00
d181a9a58d 11 2025-08-28 14:30:19 +08:00

View File

@@ -134,6 +134,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
SELECT A.FID AS FID SELECT A.FID AS FID
INTO #TEMP3 INTO #TEMP3
FROM T_SAL_ORDER A FROM T_SAL_ORDER A
INNER JOIN T_BD_CUSTOMER CC ON CC.FCUSTID= A.FCUSTID
INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 INNER JOIN T_BD_CUSTOMER_L C ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052
LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID LEFT JOIN V_BD_SALESMAN_L L ON L.fid = A.FSALERID
left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C' left JOIN T_PerformanceSharing M ON M.FSOURCEBILLNO = A.FBILLNO AND M.FDOCUMENTSTATUS = 'C'
@@ -142,10 +143,12 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=O.FNAME LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=O.FNAME
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=L.FNAME LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD>=L.FNAME
WHERE A.FSALEORGID = 100302 AND WHERE A.FSALEORGID = 100302 AND
(ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '̼<EFBFBD><EFBFBD><EFBFBD>ǿ<EFBFBD>' (
OR ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '̼<EFBFBD><EFBFBD><EFBFBD>ǿ<EFBFBD>' CC.F_correlation <> '1'
OR C.FCUSTID IN ('1517849','1156999','1149200') -- OR
OR (C.FCUSTID = 1150173 AND (ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>' OR ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>')) --C.FCUSTID IN ('1517849','1156999','1149200')
OR
(C.FCUSTID = 1150173 AND (ACO.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>' OR ACL.<EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŷ<EFBFBD>'))
OR L.FNAME = '<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>' OR L.FNAME = '<EFBFBD><EFBFBD>ŵ<EFBFBD><EFBFBD>'
OR A.FID IN (110185,207800) OR A.FID IN (110185,207800)
AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate) AND (ISNULL(@FSDate,'') = '' or A.FAPPROVEDATE > @FSDateDate)
@@ -274,7 +277,7 @@ SET @FEDateDate = DATEADD(DAY, 1, @FEDateDate);
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<2E><><EFBFBD><EFBFBD>=O.FNAME AND ISNULL(ACO.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,'') != '' LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACO ON ACO.<2E><><EFBFBD><EFBFBD>=O.FNAME AND ISNULL(ACO.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,'') != ''
LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<2E><><EFBFBD><EFBFBD>=L.FNAME AND ISNULL(ACL.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,'') != '' LEFT JOIN ERPTOHR.HYHRV3.dbo.v_erp_empinfo ACL ON ACL.<2E><><EFBFBD><EFBFBD>=L.FNAME AND ISNULL(ACL.<2E><>ϸ<EFBFBD><CFB8><EFBFBD><EFBFBD>,'') != ''
INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory INNER JOIN T_BAS_ASSISTANTDATAENTRY_L AE ON AE.FENTRYID = A.F_Ordercategory
LEFT JOIN dbo.T_BAS_ASSISTANTDATAENTRY_L assl ON assl.FENTRYID= a.F_CREDITCLASSIFICATIONTEXT LEFT JOIN dbo.T_BAS_ASSISTANTDATAENTRY_L assl ON assl.FENTRYID= I.F_CreditClassification
WHERE WHERE
1=1 AND 1=1 AND
A.FID NOT IN( A.FID NOT IN(