缴款书出口转内销添加字段

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java

@@ -931,6 +931,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
 
                     map.put("bdkMessage", dictdetaServcice.queryDictName(DictConstant.bdkMessage, bdkMessage));
 
+                    if ("1".equals(map.get("inAccountStatus"))){
+                        map.put("inAccountStatus","已入账");
+                    }else {
+                        map.put("inAccountStatus","未入账");
+                    }
+
                     map.put("taxAmount", AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("taxAmount"))));
                     map.put("yxTaxAmount",
                         AmountFormatUtil.fmtMicrometer(MathUtil.round((String)map.get("yxTaxAmount"))));

dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml

@@ -260,7 +260,9 @@
         p.image_id as imageNumber,
         p.account_period as accountPeriod,
         p.posting_time as postingTime,
-        p.sn_voucher_number as snVoucherNumber
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
@@ -489,7 +491,15 @@
         p.dept_name as businessName,
         p.rzh_belong_date as rzhBelongDate,
         p.bdk_yy as bdkYy,
-        p.bdk_message as bdkMessage
+        p.bdk_message as bdkMessage,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where
@@ -858,7 +868,9 @@
         p.image_id as imageNumber,
         p.account_period as accountPeriod,
         p.posting_time as postingTime,
-        p.sn_voucher_number as snVoucherNumber
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_customs_record p
         where

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java

@@ -95,6 +95,12 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 }
                 map.put("dataSources", dictdetaServcice.queryDictName(DictConstant.JKSCJFS, dataSources));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");
                 } else {
@@ -433,6 +439,12 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.BDK_AUTH_STATUS, authStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");
                 } else {
@@ -558,6 +570,11 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));;
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
                 map.put("bdkStatusBak", bdkStatus);
                 if (map.get("exportTaxAmount") == null || "".equals(map.get("exportTaxAmount"))) {
                     map.put("exportTaxAmount", "0.00");

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java

@@ -97,6 +97,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("invoiceDate", map.get("invoiceDate"));
                 }
                 map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
 
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
@@ -415,6 +420,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.BDK_AUTH_STATUS, authStatus));
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 map.put("exportAmount", AmountFormatUtil
                     .fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
                 map.put("exportTaxAmount", AmountFormatUtil
@@ -536,6 +547,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
 
+                if ("1".equals(map.get("inAccountStatus"))){
+                    map.put("inAccountStatus","已入账");
+                }else {
+                    map.put("inAccountStatus","未入账");
+                }
+
                 map.put("bdkStatusBak", bdkStatus);
 
                 map.put("exportAmount", AmountFormatUtil

dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml

@@ -130,7 +130,15 @@
         p.export_no as exportNo,
         p.glzt as glzt,
         p.check_status as checkStatus,
-        p.entry_discrepancy as entryDiscrepancy
+        p.entry_discrepancy as entryDiscrepancy,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         left join
@@ -249,7 +257,15 @@
         p.export_no as exportNo,
         p.cxbdk_status as cxbdkStatus,
         p.auth_status as authStatus,
-        p.bdk_status as bdkStatus
+        p.bdk_status as bdkStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where
@@ -410,7 +426,15 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxrz_status as cxrzStatus,
-        p.cxbdk_status as cxbdkStatus
+        p.cxbdk_status as cxbdkStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_customs p
         where

dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml

@@ -115,7 +115,15 @@
         p.export_amount as exportAmount,
         p.export_tax_amount as exportTaxAmount,
         p.export_yxse as exportYxse,
-        p.gf_tax_no as gfTaxNo
+        p.gf_tax_no as gfTaxNo,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where
@@ -187,7 +195,15 @@
         p.auth_status as authStatus,
         p.cxbdk_status as cxbdkStatus,
         p.bdk_status as bdkStatus,
-        p.gf_tax_no as gfTaxNo
+        p.gf_tax_no as gfTaxNo,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where company = #{queryParams.company}
@@ -334,7 +350,15 @@
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
         p.cxbdk_status as cxbdkStatus,
-        p.cxrz_status as cxrzStatus
+        p.cxrz_status as cxrzStatus,
+        p.inaccount_status as inAccountStatus,
+        p.bzdh as bzdh,
+        p.image_id as imageNumber,
+        p.account_period as accountPeriod,
+        p.posting_time as postingTime,
+        p.sn_voucher_number as snVoucherNumber,
+        p.bzr as bzr,
+        p.comp_code as compCode
         FROM
         t_dx_export_invoice p
         where