This commit is contained in:
2025-10-20 19:18:32 +08:00
parent 67e529a65e
commit 8d3235e33f

View File

@@ -50,11 +50,18 @@ C.FNAME as '
C.FNUMBER as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', --<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
C.FSPECIFICATION as '<EFBFBD>ͺŹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׼', --<EFBFBD>ͺ<EFBFBD>\<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<EFBFBD><EFBFBD>׼
A.F_contractnumber+C.FSPECIFICATION as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͺŹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׼',
CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'<EFBFBD><EFBFBD>ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_114 END as '<EFBFBD>ͺŷ<EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'<EFBFBD><EFBFBD>ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_115 END as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
C.F_116 as '<EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>',
CASE WHEN C.F_114 IS NOT NULL and C.F_114 !=' ' AND C.F_114 !='' THEN C.F_114 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<EFBFBD><EFBFBD><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7>)ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_114 END as '<EFBFBD>ͺŷ<EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN C.F_115 IS NOT NULL and C.F_115 !=' ' AND C.F_115 !='' THEN C.F_115 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<28><><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><EFBFBD><E2B4A2><>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7><>ಿ<EFBFBD><E0B2BF>'
ELSE C.F_115 END as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN C.F_116 IS NOT NULL and C.F_116 !=' ' AND C.F_116 !='' THEN C.F_116 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<28><><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><EFBFBD><E2B4A2><>ಿ<EFBFBD><E0B2BF>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL +'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7><>ಿ<EFBFBD><E0B2BF>'
ELSE C.F_116 END as '<EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>',
CASE WHEN A.F_VRYF_COMBO_LSN = 'DDXS' THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' WHEN A.F_VRYF_COMBO_LSN = 'SXTXS' THEN '<EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' WHEN A.F_VRYF_COMBO_LSN = 'XTZHT' THEN 'ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ' ELSE '' END as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN W5.FDATAVALUE = '<EFBFBD>DZ<EFBFBD>' THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ELSE '<EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1',
B.FQty as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨', --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/̨
@@ -124,7 +131,7 @@ T_BAS_PREBDTHREE W7 on W7.FID = A.F_BON --
LEFT JOIN
T_BD_CUSTOMER_L K on A.FCUSTID = K.FCUSTID --<EFBFBD>ͻ<EFBFBD>
LEFT JOIN
(Select FNumber,FENTRYID From T_BAS_ASSISTANTDATAENTRY Where FID = '670cc977263353') W8 --<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
(Select FNumber,FENTRYID From T_BAS_ASSISTANTDATAENTRY Where FID = '670cc977263353') W8 --<EFBFBD><EFBFBD>ͬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
on W8.FENTRYID = A.F_ORDERCATEGORY
LEFT JOIN
(Select a2.FDATAVALUE,a2.FENTRYID From T_BAS_ASSISTANTDATAENTRY a1 JOIN T_BAS_ASSISTANTDATAENTRY_L a2
@@ -162,12 +169,20 @@ A.F_contractnumber as '
C.FNAME as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', --<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
C.FNUMBER as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', --<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
C.FSPECIFICATION as '<EFBFBD>ͺŹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׼', --<EFBFBD>ͺ<EFBFBD>\<EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<EFBFBD><EFBFBD>׼
A.F_contractnumber+C.FSPECIFICATION as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͺŹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׼',
CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'<EFBFBD><EFBFBD>ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_114 END as '<EFBFBD>ͺŷ<EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'<EFBFBD><EFBFBD>ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_115 END as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
C.F_116 as '<EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>',
A.F_contractnumber+C.FSPECIFICATION as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͺŹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>׼',
CASE WHEN C.F_114 IS NOT NULL and C.F_114 !=' ' AND C.F_114 !='' THEN C.F_114 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<EFBFBD><EFBFBD><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7>)ʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
ELSE C.F_114 END as '<EFBFBD>ͺŷ<EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN C.F_115 IS NOT NULL and C.F_115 !=' ' AND C.F_115 !='' THEN C.F_115 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<28><><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><EFBFBD><E2B4A2><>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7><>ಿ<EFBFBD><E0B2BF>'
ELSE C.F_115 END as '<EFBFBD><EFBFBD>Ʒ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN C.F_116 IS NOT NULL and C.F_116 !=' ' AND C.F_116 !='' THEN C.F_116 when W8.FNUMBER IN ('E','ES','NWE','HKE') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(<28><><EFBFBD>ܡ<EFBFBD>΢<EFBFBD><CEA2><EFBFBD><EFBFBD><EFBFBD><E2B4A2><>ಿ<EFBFBD><E0B2BF>'
when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL +'ϵͳʣ<EFBFBD>ಿ<EFBFBD><EFBFBD>'
when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMS<4D><53>Ʒ<EFBFBD><C6B7><>ಿ<EFBFBD><E0B2BF>'
ELSE C.F_116 END as '<EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>',
CASE WHEN A.F_VRYF_COMBO_LSN = 'DDXS' THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' WHEN A.F_VRYF_COMBO_LSN = 'SXTXS' THEN '<EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' WHEN A.F_VRYF_COMBO_LSN = 'XTZHT' THEN 'ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ' ELSE '' END as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
CASE WHEN W5.FDATAVALUE = '<EFBFBD>DZ<EFBFBD>' THEN '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' ELSE '<EFBFBD><EFBFBD>ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>' END as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1',
B.FQty as '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨', --<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/̨
@@ -262,4 +277,7 @@ AND (ISNULL(@FStartDate2,'') = '' or A.FAPPROVEDATE >= @FStartDate2)
AND (ISNULL(@FEndDate2,'') = '' or A.FAPPROVEDATE < DATEADD(DAY, 1, CONVERT(DATE, @FEndDate2)))
AND A.FID NOT IN (SELECT * FROM #TEMP3)
--UPDATE #TABLEAAA SET
Select * From #TABLEAAA UNION ALL (Select * From #TABLEBBB)