From 1c34a1674359d1504c294025e43146cbb583c677 Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Wed, 21 Jun 2023 17:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=A8=8E=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jianshui/invoice/domain/BillInfo.java   | 12 ++++++++++--
 .../invoice/domain/dto/api/elephant/DDTXX.java       |  2 +-
 2 files changed, 11 insertions(+), 3 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 5a8e451..6cda011 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
@@ -336,11 +336,19 @@ public class BillInfo extends BaseEntity
     private String fjxxnr;
 
 
+    // 2023/6/19 大象冲红原因新增
+    @TableField(exist=false)
+    @ApiModelProperty(value = "冲红原因")
+    private String chyy;
 
 
+    public String getChyy() {
+        return chyy;
+    }
 
-
-
+    public void setChyy(String chyy) {
+        this.chyy = chyy;
+    }
 
     @Override
     public String getSearchValue() {
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDTXX.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDTXX.java
index 067d9a8..adde6c4 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDTXX.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDTXX.java
@@ -59,7 +59,7 @@ public class DDTXX {
         this.setHJJE(billInfo.getTaxfreeamt().toString()); // 合计金额 // 计算金额税额，在processing里
         this.setHJSE(billInfo.getTax().toString()); // 合计税额 // 计算金额税额，在processing里
         this.setBZ(billInfo.getMessage()); // 备注
-        // this.setCHYY(billInfo.get); // 冲红原因
+         this.setCHYY(billInfo.getChyy()); // 冲红原因
         if (StringUtils.equals(billInfo.getKptype(), "2")) {
             if (StringUtils.equals(billInfo.getInvoiceType(), "p")) {
                 this.setTSCHBZ("0"); // 特殊冲红标志