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 065da7e..d91a385 100644 --- a/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java +++ b/sscivm/src/public/nc/bs/sscivm/ivsale/util/InvoiceTransferUtil.java @@ -1316,8 +1316,8 @@ public class InvoiceTransferUtil { // 数电特殊票种字段 pinvoice.setBdcdz(headvo.getBdcdz()); - pinvoice.setZlqq(getFormatDate(headvo.getZlqq())); - pinvoice.setZlqz(getFormatDate(headvo.getZlqz())); + pinvoice.setZlqq(getFormatDateTime(headvo.getZlqq())); + pinvoice.setZlqz(getFormatDateTime(headvo.getZlqz())); pinvoice.setKdsbz(headvo.getKdsbz()); pinvoice.setTdzzsxmbh(headvo.getTdzzsxmbh()); pinvoice.setWqhtbabh(headvo.getWqhtbabh()); @@ -1353,10 +1353,10 @@ public class InvoiceTransferUtil { // 0:不显示 1:仅显示销地址、电话 2:仅显示购买方地址、电话 3:购销方地址、电话都显示 int einvoiceShowGxfDzDh = 0; - if ("Y".equals(def17)) { + if ("Y".equals(def4)) { einvoiceShowGxfDzDh += 1; // 销方地址电话显示 } - if ("Y".equals(def3)) { + if ("Y".equals(def17)) { einvoiceShowGxfDzDh += 2; // 购方地址电话显示 } @@ -1365,10 +1365,10 @@ public class InvoiceTransferUtil { // 0:不显示 1:仅显示销售方银行、账号 2:仅显示购买方银行、账号 3:购销方银行、账号都显示 int einvoiceShowGxfYhZh = 0; - if ("Y".equals(def18)) { + if ("Y".equals(def3)) { einvoiceShowGxfYhZh += 1; // 销方银行账户显示 } - if ("Y".equals(def4)) { + if ("Y".equals(def18)) { einvoiceShowGxfYhZh += 2; // 购方银行账户显示 } @@ -1711,4 +1711,20 @@ public class InvoiceTransferUtil { return format.format(date); } + /** + * 把UFDate转换成yyyy-MM-dd格式 + * + * @param ufDate + * @return + */ + public static String getFormatDateTime(UFDateTime ufDate) { + if (ufDate == null) { + return null; + } + Date date = ufDate.getDate().toDate(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + return format.format(date); + } + + } diff --git a/sscivm/src/public/nc/vo/sscivm/ivsale/IVApplicationHeadVO.java b/sscivm/src/public/nc/vo/sscivm/ivsale/IVApplicationHeadVO.java index 0146047..276d3ac 100644 --- a/sscivm/src/public/nc/vo/sscivm/ivsale/IVApplicationHeadVO.java +++ b/sscivm/src/public/nc/vo/sscivm/ivsale/IVApplicationHeadVO.java @@ -182,8 +182,8 @@ public class IVApplicationHeadVO extends SuperVO { private java.lang.String tspzdef99; private java.lang.String kdsbz; private java.lang.String bdcdz; - private UFDate zlqq; - private UFDate zlqz; + private UFDateTime zlqq; + private UFDateTime zlqz; private java.lang.String tdzzsxmbh; private java.lang.String wqhtbabh; private java.lang.String bdcdwdm; @@ -1665,16 +1665,16 @@ public class IVApplicationHeadVO extends SuperVO { /** - * 属性redrush_falg的Getter方法.属性名:redrush_falg - * 红冲来源标识: + * 属性redrush_falg的Getter方法.属性名:redrush_falg 红冲来源标识: + * * @param java.lang.String */ public java.lang.String getRedrush_falg() { return redrush_falg; } /** - * 属性redrush_falg的Setter方法.属性名:redrush_falg - * 红冲来源标识: + * 属性redrush_falg的Setter方法.属性名:redrush_falg 红冲来源标识: + * * @param java.lang.String */ public void setRedrush_falg(java.lang.String redrush_falg) { @@ -2081,16 +2081,20 @@ public class IVApplicationHeadVO extends SuperVO { public void setBdcdz(java.lang.String bdcdz) { this.bdcdz = bdcdz; } - public UFDate getZlqq() { + + public UFDateTime getZlqq() { return zlqq; } - public void setZlqq(UFDate zlqq) { + + public void setZlqq(UFDateTime zlqq) { this.zlqq = zlqq; } - public UFDate getZlqz() { + + public UFDateTime getZlqz() { return zlqz; } - public void setZlqz(UFDate zlqz) { + + public void setZlqz(UFDateTime zlqz) { this.zlqz = zlqz; } public java.lang.String getTdzzsxmbh() {