From d00bcaaf03ce2c2f9b22fb05f9e67f3b20a3a804 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 4 Jul 2025 08:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=8E=A8=E7=A8=8E=E5=8A=A1?=
 =?UTF-8?q?=E4=BA=91=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apply/einvoice/ApplyRequest.java          | 26 +++++++++++++++++++
 .../public/nc/dto/imag/invoice/PInvoice.java  | 21 ++++++++-------
 .../ivsale/util/InvoiceTransferUtil.java      |  6 ++---
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java b/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
index 382980e..c174a05 100644
--- a/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
+++ b/imag/src/private/nc/impl/imag/taxfactory/apply/einvoice/ApplyRequest.java
@@ -145,6 +145,10 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
             a.setGMF_DH(p.getGmf_dh());
             a.setGMF_YH(p.getGmf_yh());
             a.setGMF_ZH(p.getGmf_zh());
+
+            a.setEINVOICESHOWGXFYHZH(p.getEinvoiceshowgxfyhzh());
+            a.setEINVOICESHOWGXFDZDH(p.getEinvoiceshowgxfdzdh());
+
             a.setSLSM(p.getSlsm());
             a.setTSPZ(p.getTspz());
             a.setZDYBZ(p.getZdybz());
@@ -463,6 +467,12 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
         //购买方账号
         private String GMF_ZH;
 
+        // 数电发票是否显示购销方地址电话
+        private String EINVOICESHOWGXFDZDH;
+
+        // 数电发票是否显示购销方银行、账号
+        private String EINVOICESHOWGXFYHZH;
+
         //税率说明
         private String SLSM;
 
@@ -879,6 +889,22 @@ class ApplyRequest extends EInvoiceRequest implements IFactoryRequest {
             GMF_ZH = gMF_ZH;
         }
 
+        public String getEINVOICESHOWGXFDZDH() {
+            return EINVOICESHOWGXFDZDH;
+        }
+
+        public void setEINVOICESHOWGXFDZDH(String EINVOICESHOWGXFDZDH) {
+            this.EINVOICESHOWGXFDZDH = EINVOICESHOWGXFDZDH;
+        }
+
+        public String getEINVOICESHOWGXFYHZH() {
+            return EINVOICESHOWGXFYHZH;
+        }
+
+        public void setEINVOICESHOWGXFYHZH(String EINVOICESHOWGXFYHZH) {
+            this.EINVOICESHOWGXFYHZH = EINVOICESHOWGXFYHZH;
+        }
+
         public String getALLELCUSERNAME() {
             return ALLELCUSERNAME;
         }
diff --git a/imag/src/public/nc/dto/imag/invoice/PInvoice.java b/imag/src/public/nc/dto/imag/invoice/PInvoice.java
index e94b3dc..5f329a0 100644
--- a/imag/src/public/nc/dto/imag/invoice/PInvoice.java
+++ b/imag/src/public/nc/dto/imag/invoice/PInvoice.java
@@ -248,11 +248,12 @@ public class PInvoice extends SuperVO implements Serializable ,IEncode{
     private PInvoiceCepz[] cepzs;
 
     private PInvoiceTspz[] tspzs;
+
     // 数电发票是否显示购销方地址电话
-    private String einvoiceShowGxfDzDh;
+    private String einvoiceshowgxfdzdh;
 
     // 数电发票是否显示购销方银行、账号
-    private String einvoiceShowGxfYhZh;
+    private String einvoiceshowgxfyhzh;
 
     // 销售方电话
     private String xsfDh;
@@ -962,20 +963,20 @@ public class PInvoice extends SuperVO implements Serializable ,IEncode{
         this.kqysssxbgglbm = kqysssxbgglbm;
     }
 
-    public String getEinvoiceShowGxfDzDh() {
-        return einvoiceShowGxfDzDh;
+    public String getEinvoiceshowgxfdzdh() {
+        return einvoiceshowgxfdzdh;
     }
 
-    public void setEinvoiceShowGxfDzDh(String einvoiceShowGxfDzDh) {
-        this.einvoiceShowGxfDzDh = einvoiceShowGxfDzDh;
+    public void setEinvoiceshowgxfdzdh(String einvoiceshowgxfdzdh) {
+        this.einvoiceshowgxfdzdh = einvoiceshowgxfdzdh;
     }
 
-    public String getEinvoiceShowGxfYhZh() {
-        return einvoiceShowGxfYhZh;
+    public String getEinvoiceshowgxfyhzh() {
+        return einvoiceshowgxfyhzh;
     }
 
-    public void setEinvoiceShowGxfYhZh(String einvoiceShowGxfYhZh) {
-        this.einvoiceShowGxfYhZh = einvoiceShowGxfYhZh;
+    public void setEinvoiceshowgxfyhzh(String einvoiceshowgxfyhzh) {
+        this.einvoiceshowgxfyhzh = einvoiceshowgxfyhzh;
     }
 
     public String getXsfDh() {
diff --git a/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java b/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java
index ab943d0..2b7c674 100644
--- a/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java
+++ b/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java
@@ -1331,7 +1331,7 @@ public class InvoiceTransferUtil {
         pinvoice.setZnj(headvo.getZnj() == null ? null : getUFDoubleToBigDecimal(headvo.getZnj()).setScale(2, UFDouble.ROUND_HALF_UP));
         pinvoice.setJehj(headvo.getJehj() == null ? null : getUFDoubleToBigDecimal(headvo.getJehj()).setScale(2, UFDouble.ROUND_HALF_UP));
         pinvoice.setCjh(headvo.getCjh());
-        // pinvoice.setKqysssxbgglbm(headvo.getKqysssxbgglbm());
+        pinvoice.setKqysssxbgglbm(headvo.getKqysssxbgglbm());
 
         setOtherField(headvo, pinvoice);
         return pinvoice;
@@ -1371,9 +1371,9 @@ public class InvoiceTransferUtil {
             einvoiceShowGxfYhZh += 2; // 销方银行账户显示
         }
         // 数电发票是否显示购销方地址电话 0:不显示 1:仅显示销地址、电话 2:仅显示购买方地址、电话 3:购销方地址、电话都显示
-        pinvoice.setEinvoiceShowGxfDzDh(String.valueOf(einvoiceShowGxfDzDh));
+        pinvoice.setEinvoiceshowgxfdzdh(String.valueOf(einvoiceShowGxfDzDh));
         // 数电发票是否显示购销方银行、账号: 0:不显示 1:仅显示销售方银行、账号 2:仅显示购买方银行、账号 3:购销方银行、账号都显示
-        pinvoice.setEinvoiceShowGxfYhZh(String.valueOf(einvoiceShowGxfYhZh));
+        pinvoice.setEinvoiceshowgxfyhzh(String.valueOf(einvoiceShowGxfYhZh));
 
         pinvoice.setGmf_dh(headvo.getGmf_dh());
         pinvoice.setGmf_dz(headvo.getGmf_dz());