diff --git a/imag/src/public/nc/dto/imag/invoice/PInvoice.java b/imag/src/public/nc/dto/imag/invoice/PInvoice.java index c02241f..134f2d4 100644 --- a/imag/src/public/nc/dto/imag/invoice/PInvoice.java +++ b/imag/src/public/nc/dto/imag/invoice/PInvoice.java @@ -248,6 +248,11 @@ public class PInvoice extends SuperVO implements Serializable ,IEncode{ private PInvoiceCepz[] cepzs; private PInvoiceTspz[] tspzs; + // 数电发票是否显示购销方地址电话 + private String einvoiceShowGxfDzDh; + + // 数电发票是否显示购销方银行、账号 + private String einvoiceShowGxfYhZh; public String getApplyNumber() { @@ -945,6 +950,22 @@ public class PInvoice extends SuperVO implements Serializable ,IEncode{ this.kqysssxbgglbm = kqysssxbgglbm; } + 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; + } + @Override public String toString() { 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 7ab9bef..7cf39e3 100644 --- a/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java +++ b/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java @@ -1333,9 +1333,49 @@ public class InvoiceTransferUtil { pinvoice.setCjh(headvo.getCjh()); // pinvoice.setKqysssxbgglbm(headvo.getKqysssxbgglbm()); + setOtherField(headvo, pinvoice); return pinvoice; } + private static void setOtherField(IVApplicationHeadVO headvo, PInvoice pinvoice) { + // 是否展示销售方开户银行及账号 Y-是/N-否 + String def3 = headvo.getDef3(); + // 是否展示销售方地址电话 + String def4 = headvo.getDef4(); + // 是否填写收款人及复核人 + String def16 = headvo.getDef16(); + // 是否展示购买方单位、地址电话 + String def17 = headvo.getDef17(); + // 是否展示购买方开户行、银行账号 + String def18 = headvo.getDef18(); + + // einvoiceShowGxfDzDh 表示是否显示购方和销方的地址电话 + // 根据需求:0: 不显示 1: 显示购方地址电话 2: 显示销方地址电话 3: 显示购方和销方地址电话 + int einvoiceShowGxfDzDh = 0; + + if ("Y".equals(def3)) { + einvoiceShowGxfDzDh += 1; // 购方地址电话显示 + } + if ("Y".equals(def17)) { + einvoiceShowGxfDzDh += 2; // 销方地址电话显示 + } + + // einvoiceShowGxfYhZh 表示是否显示购方和销方的小银行账户 + // 根据需求:0: 不显示 1: 显示购方银行账户 2: 显示销方银行账户 3: 显示购方和销方银行账户 + int einvoiceShowGxfYhZh = 0; + + if ("Y".equals(def4)) { + einvoiceShowGxfYhZh += 1; // 购方银行账户显示 + } + if ("Y".equals(def18)) { + einvoiceShowGxfYhZh += 2; // 销方银行账户显示 + } + // 数电发票是否显示购销方地址电话 0:不显示 1:仅显示销地址、电话 2:仅显示购买方地址、电话 3:购销方地址、电话都显示 + pinvoice.setEinvoiceShowGxfDzDh(String.valueOf(einvoiceShowGxfDzDh)); + // 数电发票是否显示购销方银行、账号: 0:不显示 1:仅显示销售方银行、账号 2:仅显示购买方银行、账号 3:购销方银行、账号都显示 + pinvoice.setEinvoiceShowGxfYhZh(String.valueOf(einvoiceShowGxfYhZh)); + } + /** * 根据红冲申请转换成发票平台VO *