diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java b/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java index 82c2ad86..18a0fd96 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java @@ -128,6 +128,8 @@ public class InvoiceCheckVehicleDetailModel { */ private String taxRate; + private String taxCode; + /** * This field was generated by MyBatis Generator. This field corresponds to the database column * t_dx_check_vehicle_sale_invoice.tax_bureau_name diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java index eb50a46f..7102e569 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java @@ -41,6 +41,7 @@ public class InvoiceDetailInfo extends BasePojo { private String detailAmount; private String taxRate; + private String taxCode; private String taxAmount; diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index 1a1d055d..f652b37a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -403,6 +403,10 @@ public class CheckTaskServiceImpl implements CheckTaskService { invoiceDetailInfo.setTxrqz(invoiceDetail.getTxrqz()); // 税率 invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate()); + //山能项目 增加税码字段 + if(invoiceDetail.getTaxRate() != null){ + invoiceDetailInfo.setTaxCode(getZSM(invoiceDetail.getTaxRate())); + } // 单位 invoiceDetailInfo.setUnit(invoiceDetail.getUnit()); // 金额 @@ -417,6 +421,95 @@ public class CheckTaskServiceImpl implements CheckTaskService { return invoiceDetailInfoList; } + private String getZSM(String taxRate) { + + String sm = ""; + + switch (taxRate) { + // 发票采集 + case "0": + sm = "J0"; + break; + case "0.00": + sm = "J0"; + break; + case "0.000": + sm = "J0"; + break; + case "免税": + sm = "J0"; + break; + case "0.16": + sm = "J1"; + break; + case "0.13": + sm = "J2"; + break; + case "0.10": + sm = "J3"; + break; + case "0.09": + sm = "J4"; + break; + case "0.06": + sm = "J5"; + break; + case "0.05": + sm = "J6"; + break; + case "0.03": + sm = "J7"; + break; + case "0.02": + sm = "J8"; + break; + case "0.01": + sm = "J9"; + break; + case "0.17": + sm = "JC"; + break; + case "16": + sm = "J1"; + break; + case "13": + sm = "J2"; + break; + case "10": + sm = "J3"; + break; + case "9": + sm = "J4"; + break; + case "6": + sm = "J5"; + break; + case "5": + sm = "J6"; + break; + case "3": + sm = "J7"; + break; + case "2": + sm = "J8"; + break; + case "1.5": + sm = "JA"; + break; + case "1": + sm = "J9"; + break; + case "17": + sm = "JC"; + break; + default: + sm = ""; + break; + + } + return sm; + } + /** * 构建统计实体集 * @@ -627,6 +720,7 @@ public class CheckTaskServiceImpl implements CheckTaskService { invoiceCheckVehicleDetailModel.setEngineNo(responseInvoice.getEngineNo()); invoiceCheckVehicleDetailModel.setVehicleNo(responseInvoice.getVehicleNo()); invoiceCheckVehicleDetailModel.setTaxRate(responseInvoice.getTaxRate()); + invoiceCheckVehicleDetailModel.setTaxCode(getZSM(responseInvoice.getTaxRate())); invoiceCheckVehicleDetailModel.setTaxBureauName(responseInvoice.getTaxBureauName()); invoiceCheckVehicleDetailModel.setTaxBureauCode(responseInvoice.getTaxBureauCode()); invoiceCheckVehicleDetailModel.setTaxRecords(responseInvoice.getTaxRecords()); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ef1feb75..ca6262a7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -1000,6 +1000,39 @@ public class SDNYMainProcessController extends AbstractController { case "0.17": sm = "JC"; break; + case "16": + sm = "J1"; + break; + case "13": + sm = "J2"; + break; + case "10": + sm = "J3"; + break; + case "9": + sm = "J4"; + break; + case "6": + sm = "J5"; + break; + case "5": + sm = "J6"; + break; + case "3": + sm = "J7"; + break; + case "2": + sm = "J8"; + break; + case "1.5": + sm = "JA"; + break; + case "1": + sm = "J9"; + break; + case "17": + sm = "JC"; + break; default: sm = ""; break; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index ecc4ed3b..e04faabf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -378,6 +378,42 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl