diff --git a/非C#代码文件/派诺合同明细存储过程.sql b/非C#代码文件/派诺合同明细存储过程.sql index f0007c1..57a20ac 100644 --- a/非C#代码文件/派诺合同明细存储过程.sql +++ b/非C#代码文件/派诺合同明细存储过程.sql @@ -50,11 +50,18 @@ C.FNAME as ' C.FNUMBER as 'Ʒ', --Ʒ C.FSPECIFICATION as 'ͺŹ׼', --ͺ\\׼ A.F_contractnumber+C.FSPECIFICATION as 'ͺŹ׼', -CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ʣಿ' -ELSE C.F_114 END as 'ͺŷ', -CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ʣಿ' -ELSE C.F_115 END as 'Ʒ', -C.F_116 as 'ҵ', +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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_114 END as 'ͺŷ', +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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_115 END as 'Ʒ', + 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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL +'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_116 END as 'ҵ', CASE WHEN A.F_VRYF_COMBO_LSN = 'DDXS' THEN '' WHEN A.F_VRYF_COMBO_LSN = 'SXTXS' THEN 'ϵͳ' WHEN A.F_VRYF_COMBO_LSN = 'XTZHT' THEN 'ϵͳͬ' ELSE '' END as '', CASE WHEN W5.FDATAVALUE = 'DZ' THEN '' ELSE 'ϵͳ' END as '1', B.FQty as '̨', --/̨ @@ -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 --ͻ LEFT JOIN -(Select FNumber,FENTRYID From T_BAS_ASSISTANTDATAENTRY Where FID = '670cc977263353') W8 --ͬ +(Select FNumber,FENTRYID From T_BAS_ASSISTANTDATAENTRY Where FID = '670cc977263353') W8 --ͬ 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 'Ʒ', --Ʒ C.FNUMBER as 'Ʒ', --Ʒ C.FSPECIFICATION as 'ͺŹ׼', --ͺ\\׼ -A.F_contractnumber+C.FSPECIFICATION as 'ͺŹ׼', -CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ʣಿ' -ELSE C.F_114 END as 'ͺŷ', -CASE WHEN W8.FNUMBER = 'SX' AND C.FNUMBER like 'L%' AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ʣಿ' -ELSE C.F_115 END as 'Ʒ', -C.F_116 as 'ҵ', +A.F_contractnumber+C.FSPECIFICATION as 'ͺŹ׼', +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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_114 END as 'ͺŷ', +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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_115 END as 'Ʒ', + 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+'(ܡ΢硢ⴢ)ʣಿ' + when W8.FNUMBER not IN ('E','ES','NWE','HKE','BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL +'ϵͳʣಿ' + when W8.FNUMBER IN ('BS') AND ISNULL(B.F_PROJECTPROPOSAL,'')!='' THEN B.F_PROJECTPROPOSAL+'(BMSƷ)ʣಿ' +ELSE C.F_116 END as 'ҵ', + CASE WHEN A.F_VRYF_COMBO_LSN = 'DDXS' THEN '' WHEN A.F_VRYF_COMBO_LSN = 'SXTXS' THEN 'ϵͳ' WHEN A.F_VRYF_COMBO_LSN = 'XTZHT' THEN 'ϵͳͬ' ELSE '' END as '', CASE WHEN W5.FDATAVALUE = 'DZ' THEN '' ELSE 'ϵͳ' END as '1', B.FQty as '̨', --/̨ @@ -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) \ No newline at end of file