From 279bb7db5e3bfa8d8c75dced86228a006c0db703 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Fri, 10 Nov 2023 17:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jianshui/invoice/domain/BillInfo.java   | 12 ++++++------
 .../dto/adapter/request/aisino_jn/HxBillInfoDTO.java |  4 +++-
 .../aisino/console/AisinoConsoleInvoiceAddDTO.java   |  9 ++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

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 ee35a4f..d40308c 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
@@ -425,7 +425,7 @@ public class BillInfo extends BaseEntity
 
     @TableField(exist=false)
     /** 生产企业名称*/
-    private String ManufacturerName;
+    private String manufacturerName;
 
     @TableField(exist=false)
     /** 价税合计*/
@@ -438,7 +438,7 @@ public class BillInfo extends BaseEntity
 //    private String documentNr;
     @TableField(exist=false)
     /** 机动车发票票面版式标志*/
-    private String InfoClientAddressPhone;
+    private String infoClientAddressPhone;
 
     public String getEnginNo() {
         return enginNo;
@@ -513,11 +513,11 @@ public class BillInfo extends BaseEntity
     }
 
     public String getManufacturerName() {
-        return ManufacturerName;
+        return manufacturerName;
     }
 
     public void setManufacturerName(String manufacturerName) {
-        ManufacturerName = manufacturerName;
+        manufacturerName = manufacturerName;
     }
 
     public String getAmountTaxTotal() {
@@ -537,11 +537,11 @@ public class BillInfo extends BaseEntity
     }
 
     public String getInfoClientAddressPhone() {
-        return InfoClientAddressPhone;
+        return infoClientAddressPhone;
     }
 
     public void setInfoClientAddressPhone(String infoClientAddressPhone) {
-        InfoClientAddressPhone = infoClientAddressPhone;
+        infoClientAddressPhone = infoClientAddressPhone;
     }
 
     public List<Fjys> getFjysList() {
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 bd5f604..9917232 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
@@ -489,11 +489,13 @@ public class HxBillInfoDTO extends BillInfo {
     private String vehicleNo;
     private String enginNo;
     /** 生产企业名称*/
-    private String ManufacturerName;
+    private String manufacturerName;
     /** 价税合计*/
     private String amountTaxTotal;
     /** 限乘人数*/
     private String peopleNo;
+    /** 机动车发票票面版式标志*/
+    private String infoClientAddressPhone;
     /** 机动车新加 end*/
 
 
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 cb771a5..0191f6b 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
@@ -142,6 +142,7 @@ public class AisinoConsoleInvoiceAddDTO {
     /** 发动机号*/
     private String enginNo;
     /** 生产企业名称*/
+    @Alias("manufacturerName")
     private String ManufacturerName;
     /** 价税合计*/
     private String amountTaxTotal;
@@ -160,9 +161,7 @@ public class AisinoConsoleInvoiceAddDTO {
     /** 税率*/
     @Alias("taxrate")
     private String infoTaxRate;
-    /** 吨位*/
-    @Alias("unit")
-    private String tonnage;
+
     /** 限乘人数*/
     private String peopleNo;
     /** 备注*/
@@ -174,7 +173,11 @@ public class AisinoConsoleInvoiceAddDTO {
     @Alias("clerk")
     private String infoInvoicer;
     /** 机动车发票票面版式标志*/
+    @Alias("infoClientAddressPhone")
     private String InfoClientAddressPhone;
+    /** 吨位*/
+    @Alias("unit")
+    private String tonnage;
     /** 机动车蓝字发票开具时间*/
     @Alias("invoicedate")
     private String JDCBlueInvKJSJ;