From ad37b7411ed4dcdc3a64995b79bfc4d40e54dea1 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Thu, 26 Oct 2023 17:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=8A=A8=E8=BD=A6?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=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/BillInfo.java | 111 ++++++++++++++++++
 .../console/AisinoConsoleInvoiceAddDTO.java   |  11 ++
 2 files changed, 122 insertions(+)

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 a202802..fd17d25 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
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Date;
 import java.util.Map;
 
+import cn.hutool.core.annotation.Alias;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jianshui.common.annotation.Excel;
@@ -396,16 +397,126 @@ public class BillInfo extends BaseEntity
     private String jdcbz; // 机动车标志
 
 
+    /** 车辆类型*/
+    private String vehicleKind;
+    /** 厂牌型号*/
+    private String brandModel;
+    /** 产地*/
+    private String originPlace;
+    /** 合格证号*/
+    private String qualityCertificate;
+    /** 进口证明书号*/
+    private String impCertificateNo;
+    /** 商检单号*/
+    private String commInspectionNo;
+    /** 发动机号*/
+    private String vehicleNo;
+    /** 生产企业名称*/
+    private String ManufacturerName;
+    /** 价税合计*/
+    private String amountTaxTotal;
+    /** 限乘人数*/
+    private String peopleNo;
+    /** 单据编号*/
+//    private String documentNr;
+    /** 机动车发票票面版式标志*/
+    private String InfoClientAddressPhone;
 
+    public String getJdcbz() {
+        return jdcbz;
+    }
+
+    public void setJdcbz(String jdcbz) {
+        this.jdcbz = jdcbz;
+    }
+
+    public String getVehicleKind() {
+        return vehicleKind;
+    }
+
+    public void setVehicleKind(String vehicleKind) {
+        this.vehicleKind = vehicleKind;
+    }
+
+    public String getBrandModel() {
+        return brandModel;
+    }
+
+    public void setBrandModel(String brandModel) {
+        this.brandModel = brandModel;
+    }
+
+    public String getOriginPlace() {
+        return originPlace;
+    }
+
+    public void setOriginPlace(String originPlace) {
+        this.originPlace = originPlace;
+    }
+
+    public String getQualityCertificate() {
+        return qualityCertificate;
+    }
+
+    public void setQualityCertificate(String qualityCertificate) {
+        this.qualityCertificate = qualityCertificate;
+    }
 
+    public String getImpCertificateNo() {
+        return impCertificateNo;
+    }
 
+    public void setImpCertificateNo(String impCertificateNo) {
+        this.impCertificateNo = impCertificateNo;
+    }
 
+    public String getCommInspectionNo() {
+        return commInspectionNo;
+    }
+
+    public void setCommInspectionNo(String commInspectionNo) {
+        this.commInspectionNo = commInspectionNo;
+    }
 
+    public String getVehicleNo() {
+        return vehicleNo;
+    }
 
+    public void setVehicleNo(String vehicleNo) {
+        this.vehicleNo = vehicleNo;
+    }
 
+    public String getManufacturerName() {
+        return ManufacturerName;
+    }
 
+    public void setManufacturerName(String manufacturerName) {
+        ManufacturerName = manufacturerName;
+    }
 
+    public String getAmountTaxTotal() {
+        return amountTaxTotal;
+    }
 
+    public void setAmountTaxTotal(String amountTaxTotal) {
+        this.amountTaxTotal = amountTaxTotal;
+    }
+
+    public String getPeopleNo() {
+        return peopleNo;
+    }
+
+    public void setPeopleNo(String peopleNo) {
+        this.peopleNo = peopleNo;
+    }
+
+    public String getInfoClientAddressPhone() {
+        return InfoClientAddressPhone;
+    }
+
+    public void setInfoClientAddressPhone(String infoClientAddressPhone) {
+        InfoClientAddressPhone = infoClientAddressPhone;
+    }
 
     public List<Fjys> getFjysList() {
         return fjysList;
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
index aa9a443..8a46807 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java
@@ -89,6 +89,7 @@ public class AisinoConsoleInvoiceAddDTO {
     /**
      * 销售单号
      */
+    @Alias("orderno")
     private String documentNr;
 
     /**
@@ -121,6 +122,7 @@ public class AisinoConsoleInvoiceAddDTO {
     private String infoClientName;
 
     /** 身份证号码/组织机 构代码*/
+    @Alias("bsrysfzjhm")
     private String IDCard;
 
     /** 车辆类型*/
@@ -142,28 +144,37 @@ public class AisinoConsoleInvoiceAddDTO {
     /** 价税合计*/
     private String amountTaxTotal;
     /** 销货单位 电话*/
+    @Alias("salephone")
     private String sellerPhone;
     /** 销货单位 账号*/
+    @Alias("saleaccount")
     private String sellerAccount;
     /** 销货单位 地址*/
+    @Alias("saleaddress")
     private String sellerAddress;
     /** 销货单位 开户银行*/
+    @Alias("saleaccount")
     private String sellerBank;
     /** 税率*/
+    @Alias("taxrate")
     private String infoTaxRate;
     /** 吨位*/
+    @Alias("unit")
     private String tonnage;
     /** 限乘人数*/
     private String peopleNo;
     /** 备注*/
+    @Alias("message")
     private String infoNotes;
     /** 单据编号*/
 //    private String documentNr;
     /** 开票人*/
+    @Alias("clerk")
     private String infoInvoicer;
     /** 机动车发票票面版式标志*/
     private String InfoClientAddressPhone;
     /** 机动车蓝字发票开具时间*/
+    @Alias("invoicedate")
     private String JDCBlueInvKJSJ;
     /** 填开、校验、空白作废标志*/
 //    private String CheckEWM;