feature:对接煤炭字段

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)

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)

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;
 
 
 

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<InvoiceAllAddtdywxxDTO> tdywxx;
 

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;

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;//煤炭品质信息
+
 
 }

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()); // 货物运输

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()); // 货物运输