From 9c56e1b6ad2f22451db6944e5326f158c68d2106 Mon Sep 17 00:00:00 2001 From: dfh <1191093413@qq.com> Date: Thu, 26 Dec 2024 16:09:13 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E5=AF=B9=E6=8E=A5=E7=85=A4=E7=82=AD?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jianshui/invoice/domain/BillDetail.java | 14 ++++++++++++++ .../java/com/jianshui/invoice/domain/BillInfo.java | 12 ++++++++++++ .../adapter/request/aisino_jn/HxBillDetailDTO.java | 3 +++ .../adapter/request/aisino_jn/HxBillInfoDTO.java | 3 +++ .../invoice/domain/dto/api/elephant/DDMXXX.java | 9 +++++++++ .../invoice/domain/dto/api/elephant/Qdtxx.java | 2 ++ .../ElephantInvoiceApiV6ByInspurServiceImpl.java | 2 +- .../impl/api/ElephantInvoiceApiV6ServiceImpl.java | 2 +- 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillDetail.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillDetail.java index 0446c98..cb10642 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillDetail.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillDetail.java @@ -2,6 +2,8 @@ package com.jianshui.invoice.domain; import java.math.BigDecimal; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.jianshui.common.annotation.Excel; import com.jianshui.common.core.domain.BaseEntity; @@ -109,6 +111,10 @@ public class BillDetail extends BaseEntity @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private Date updatedTime; + //煤炭种类代码 + @TableField(exist = false) + private String mtzldm; + public void setId(Long id) { this.id = id; @@ -317,6 +323,14 @@ public class BillDetail extends BaseEntity return updatedTime; } + public String getMtzldm() { + return mtzldm; + } + + public void setMtzldm(String mtzldm) { + this.mtzldm = mtzldm; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java index fb98d0f..401f554 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java @@ -486,6 +486,10 @@ public class BillInfo extends BaseEntity @TableField(exist=false) private String tsxt; + /** 煤炭品质信息 */ + @TableField(exist=false) + private String mtpzxx; + public String getRequestId() { return requestId; } @@ -1521,6 +1525,14 @@ public class BillInfo extends BaseEntity this.JDCXX = JDCXX; } + public String getMtpzxx() { + return mtpzxx; + } + + public void setMtpzxx(String mtpzxx) { + this.mtpzxx = mtpzxx; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java index 5ad1bea..adc91c0 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillDetailDTO.java @@ -195,6 +195,9 @@ public class HxBillDetailDTO implements Serializable { //折扣 @JSONField(name = "discount") private String discount; + //煤炭种类代码 + @JSONField(name = "mtzldm") + private String mtzldm; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java index 7e4d82e..c9bb3b5 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/adapter/request/aisino_jn/HxBillInfoDTO.java @@ -445,6 +445,9 @@ public class HxBillInfoDTO extends BillInfo { @ApiModelProperty(value = "附加信息内容") private String fjxxnr; + @ApiModelProperty(value = "煤炭品质信息") + private String mtpzxx; + // @ApiModelProperty(value = "不动产") // List tdywxx; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java index 22e2bfc..b091311 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java @@ -122,6 +122,7 @@ public class DDMXXX { this.BYZD1 = ""; // 备用字段 1 this.BYZD2 = ""; // 备用字段 2 this.BYZD3 = ""; // 备用字段 3 + this.MTZLDM = billDetail.getMtzldm(); } @@ -145,6 +146,7 @@ public class DDMXXX { private String BYZD1; // 备用字段 1 private String BYZD2; // 备用字段 2 private String BYZD3; // 备用字段 3 + private String MTZLDM;//煤炭种类代码 public void setXH(String XH) { this.XH = XH; @@ -305,6 +307,13 @@ public class DDMXXX { public String getBYZD3() { return BYZD3; } + public String getMTZLDM() { + return MTZLDM; + } + + public void setMTZLDM(String MTZLDM) { + this.MTZLDM = MTZLDM; + } public DDMXXX getSelf() { return this; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java index 47d2bb0..2b2b545 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/Qdtxx.java @@ -50,5 +50,7 @@ public class Qdtxx { private Jdcxx JDCXX; // 机动车信息 + private String MTPZXX;//煤炭品质信息 + } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java index 8151b30..41798e2 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ByInspurServiceImpl.java @@ -218,7 +218,7 @@ public class ElephantInvoiceApiV6ByInspurServiceImpl implements IInvoiceApiServi // 2023/9/22 特定要素类型代码处理 qdtxx.setTdys(billInfo.getTdys()); - + qdtxx.setMTPZXX(billInfo.getMtpzxx()); qdtxx.setQydm(billInfo.getDqbm()); qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index 77afc19..0bd4d7b 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -260,7 +260,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { // 2023/9/22 特定要素类型代码处理 qdtxx.setTdys(billInfo.getTdys()); - + qdtxx.setMTPZXX(billInfo.getMtpzxx()); qdtxx.setQydm(billInfo.getDqbm()); qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输