[DEV] add xxfp formula for xxkp

atms-dao/src/main/resources/pwc/taxtech/atms/invoice/extends/OutputInvoiceExtendsMapper.xml

@@ -196,7 +196,6 @@
 
     <select id="getOutputInvoiceWithDetail" resultMap="outputInvoiceDto">
         SELECT
---         INVOICE.ID AS INVOICE_ID,
         INVOICE.ID AS INVOICEID,
         INVOICE.FPQQLSH,
         INVOICE.FPDM,
@@ -218,42 +217,13 @@
         INVOICE.SKR,
         INVOICE.FHR,
         INVOICE.KPR,
-        INVOICE.KDDH,
-        INVOICE.KDUUID,
         INVOICE.FPLX,
-        INVOICE.KPZT,
         INVOICE.FPZT,
-        INVOICE.YFPDM,
-        INVOICE.YFPHM,
-        INVOICE.GFGSBM,
-        INVOICE.XFGSBM,
         INVOICE.SPBH,
         INVOICE.XTLY,
         INVOICE.CJSJ,
         INVOICE.HJJE AS INVOICE_HJJE,
         INVOICE.HJSE,
-        INVOICE.JSHJ,
-        INVOICE.XXBBH,
-        INVOICE.DYZT,
-        INVOICE.GDJLH,
-        INVOICE.ZKJE AS INVOICE_ZKJE,
-        INVOICE.ZKSE AS INVOICE_ZKSE,
-        INVOICE.ZKJSHJ,
-        INVOICE.SLV AS INVOICE_SLV,
-        INVOICE.QY,
-        INVOICE.JSZT,
-        INVOICE.KDGS,
-        INVOICE.SHZT,
-        INVOICE.THKPSQ,
-        INVOICE.JSFJ,
-        INVOICE.SQR,
-        INVOICE.BSCDM,
-        INVOICE.BSC,
-        INVOICE.QYDM,
-        INVOICE.SQBH,
-        INVOICE.HTBH,
-        INVOICE.SQRQ,
-        INVOICE.YZRQ,
         INVOICEDETAIL.ID AS DETAIL_ID,
         INVOICEDETAIL.FPQQLSH AS INVOICE_FPQQLSH,
         INVOICEDETAIL.SPMC,
@@ -280,14 +250,70 @@
         INVOICEDETAIL.XSDD,
         INVOICEDETAIL.HSJUUID
         FROM
-          OUTPUT_INVOICE INVOICE
-        JOIN
-          OUTPUT_INVOICE_DETAIL INVOICEDETAIL
-        ON
-        INVOICE.FPQQLSH = INVOICEDETAIL.FPQQLSH
-        where INVOICE.FPZT != '1' and 1=1
+        OUTPUT_INVOICE INVOICE
+        JOIN OUTPUT_INVOICE_DETAIL INVOICEDETAIL ON INVOICE.FPQQLSH = INVOICEDETAIL.FPQQLSH
+        WHERE
+        INVOICE.FPZT != '1'
+        AND 1 = 1 UNION ALL
+        SELECT
+        INVOICE.ID AS INVOICEID,
+        INVOICE.FPQQLSH,
+        INVOICE.FPDM,
+        INVOICE.FPHM,
+        INVOICE.KPRQ,
+        INVOICE.FPLXDM,
+        INVOICE.EWM,
+        INVOICE.JQBH,
+        INVOICE.JYM,
+        INVOICE.GFMC,
+        INVOICE.GFSH,
+        INVOICE.GFDZDH,
+        INVOICE.GFYHZH,
+        INVOICE.XFSH,
+        INVOICE.XFMC,
+        INVOICE.XFDZDH,
+        INVOICE.XFYHZH,
+        INVOICE.BZ,
+        INVOICE.SKR,
+        INVOICE.FHR,
+        INVOICE.KPR,
+        INVOICE.FPLX,
+        INVOICE.FPZT,
+        INVOICE.SPBH,
+        INVOICE.XTLY,
+        INVOICE.CJSJ,
+        INVOICE.HJJE AS INVOICE_HJJE,
+        INVOICE.HJSE,
+        INVOICEDETAIL.ID AS DETAIL_ID,
+        INVOICEDETAIL.FPQQLSH AS INVOICE_FPQQLSH,
+        INVOICEDETAIL.SPMC,
+        INVOICEDETAIL.GGXH,
+        INVOICEDETAIL.DW,
+        INVOICEDETAIL.DJ,
+        INVOICEDETAIL.SL,
+        INVOICEDETAIL.JE,
+        INVOICEDETAIL.SLV AS ITEM_SLV,
+        INVOICEDETAIL.SE,
+        INVOICEDETAIL.HSBZ,
+        INVOICEDETAIL.LSLBS,
+        INVOICEDETAIL.YHZCBS,
+        INVOICEDETAIL.YHZCMC,
+        INVOICEDETAIL.MXXH,
+        INVOICEDETAIL.FPHXZ,
+        INVOICEDETAIL.SSFLDM,
+        INVOICEDETAIL.ZXBM,
+        INVOICEDETAIL.ZKHJJE,
+        INVOICEDETAIL.ZKSE,
+        INVOICEDETAIL.ZKJE,
+        INVOICEDETAIL.HJJE,
+        INVOICEDETAIL.JHH,
+        INVOICEDETAIL.XSDD,
+        INVOICEDETAIL.HSJUUID
+        FROM
+        OUTPUT_FPXXTB INVOICE
+        JOIN OUTPUT_INVOICE_DETAIL INVOICEDETAIL ON INVOICE.FPQQLSH = INVOICEDETAIL.FPQQLSH
         ORDER BY
-        INVOICE.FPHM
+        FPHM
     </select>