diff --git a/src/main/java/cokr/xit/interfaces/sntris/fileoffer/Ye22NoticeInfoDTO.java b/src/main/java/cokr/xit/interfaces/sntris/fileoffer/Ye22NoticeInfoDTO.java index 42f5c64..fd39286 100644 --- a/src/main/java/cokr/xit/interfaces/sntris/fileoffer/Ye22NoticeInfoDTO.java +++ b/src/main/java/cokr/xit/interfaces/sntris/fileoffer/Ye22NoticeInfoDTO.java @@ -18,6 +18,15 @@ import cokr.xit.interfaces.sntris.SntrisWSDTO; public class Ye22NoticeInfoDTO extends SntrisWSDTO { private static final long serialVersionUID = 1L; + /* 추가 고려 + finalAmt + gasanAmt + gigumAmt + gukseAmt + guseAmt + siseAmt + totalAmt + */ /** 계좌번호(씨티) */ private String CAccountNo; /** 계좌번호(수협) */ @@ -130,6 +139,14 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { private long siseIja; /** 과세금액 */ private long taxAmt; + + private long siseAmt; + private long guseAmt; + private long gukseAmt; + private long gigumAmt; + private long gasanAmt; + private long finalAmt; + private long totalAmt; /** 과세구분 코드 */ private String taxGubun; /** 과세구분 이름 */ @@ -202,6 +219,15 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { long siseGasanAmt, long siseIja, long taxAmt, + + long siseAmt, + long guseAmt, + long gukseAmt, + long gigumAmt, + long gasanAmt, + long finalAmt, + long totalAmt, + String taxGubun, String taxGubunNm, String taxNo, @@ -265,6 +291,15 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { this.siseGasanAmt = siseGasanAmt; this.siseIja = siseIja; this.taxAmt = taxAmt; + + this.siseAmt = siseAmt; + this.guseAmt = guseAmt; + this.gukseAmt = gukseAmt; + this.gigumAmt = gigumAmt; + this.gasanAmt = gasanAmt; + this.finalAmt = finalAmt; + this.totalAmt = totalAmt; + this.taxGubun = taxGubun; this.taxGubunNm = taxGubunNm; this.taxNo = taxNo; @@ -1057,6 +1092,62 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { this.taxAmt = taxAmt; } + public long getSiseAmt() { + return siseAmt; + } + + public void setSiseAmt(long siseAmt) { + this.siseAmt = siseAmt; + } + + public long getGuseAmt() { + return guseAmt; + } + + public void setGuseAmt(long guseAmt) { + this.guseAmt = guseAmt; + } + + public long getGukseAmt() { + return gukseAmt; + } + + public void setGukseAmt(long gukseAmt) { + this.gukseAmt = gukseAmt; + } + + public long getGigumAmt() { + return gigumAmt; + } + + public void setGigumAmt(long gigumAmt) { + this.gigumAmt = gigumAmt; + } + + public long getGasanAmt() { + return gasanAmt; + } + + public void setGasanAmt(long gasanAmt) { + this.gasanAmt = gasanAmt; + } + + public long getFinalAmt() { + return finalAmt; + } + + public void setFinalAmt(long finalAmt) { + this.finalAmt = finalAmt; + } + + public long getTotalAmt() { + return totalAmt; + } + + public void setTotalAmt(long totalAmt) { + this.totalAmt = totalAmt; + } + /**Gets 과세구분 * @return taxGubun */ @@ -1159,47 +1250,47 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { /**기금합계를 반환한다. * @return 기금합계 */ - public long getGigumAmt() { + public long gigumAmt() { return gigum + gigumGasanAmt + gigumIja; } /**국세합계를 반환한다. * @return 국세합계 */ - public long getGukseAmt() { + public long gukseAmt() { return gukse + gukseGasanAmt + gukseIja; } /**시세합계를 반환한다. * @return 시세합계 */ - public long getSiseAmt() { + public long siseAmt() { return sise + siseGasanAmt + siseIja; } /**구세합계를 반환한다. * @return 구세합계 */ - public long getGuseAmt() { + public long guseAmt() { return guse + guseGasanAmt + guseIja; } /**가산금 합계를 반환한다. * @return 가산금 합계 */ - public long getGasanAmt() { + public long gasanAmt() { return getSiseGasanAmt() + getGuseGasanAmt() + getGukseGasanAmt() + getGigumGasanAmt(); } /**금액 합계를 반환한다. * @return 금액 합계 */ - public long getTotalAmt() { - return getTaxAmt() + getGasanAmt(); + public long totalAmt() { + return getTaxAmt() + gasanAmt(); } /**최종금액을 반환한다. * @return 최종금액 */ - public long getFinalAmt() { - return getTaxAmt() - getGigumAmt() - getGukseAmt() - getSiseAmt() - getGuseAmt(); + public long finalAmt() { + return getTaxAmt() - gigumAmt() - gukseAmt() - siseAmt() - guseAmt(); } private Object __equalsCalc = null; @@ -1269,6 +1360,15 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { this.siseGasanAmt == other.getSiseGasanAmt() && this.siseIja == other.getSiseIja() && this.taxAmt == other.getTaxAmt() && + + this.siseAmt == other.getSiseAmt() && + this.guseAmt == other.getGuseAmt() && + this.gukseAmt == other.getGukseAmt() && + this.gigumAmt == other.getGigumAmt() && + this.gasanAmt == other.getGasanAmt() && + this.finalAmt == other.getFinalAmt() && + this.totalAmt == other.getTotalAmt() && + equals(this.taxGubun, other.getTaxGubun()) && equals(this.taxGubunNm, other.getTaxGubunNm()) && equals(this.taxNo, other.getTaxNo()) && @@ -1343,6 +1443,15 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { Long.valueOf(getSiseGasanAmt()), Long.valueOf(getSiseIja()), Long.valueOf(getTaxAmt()), + + Long.valueOf(getSiseAmt()), + Long.valueOf(getGuseAmt()), + Long.valueOf(getGukseAmt()), + Long.valueOf(getGigumAmt()), + Long.valueOf(getGasanAmt()), + Long.valueOf(getFinalAmt()), + Long.valueOf(getTotalAmt()), + getTaxGubun(), getTaxGubunNm(), getTaxNo(), @@ -1416,6 +1525,15 @@ public class Ye22NoticeInfoDTO extends SntrisWSDTO { desc.field(name = "siseGasanAmt", desc.qname("", name), "long", false), desc.field(name = "siseIja", desc.qname("", name), "long", false), desc.field(name = "taxAmt", desc.qname("", name), "long", false), + + desc.field(name = "siseAmt", desc.qname("", name), "long", false), + desc.field(name = "guseAmt", desc.qname("", name), "long", false), + desc.field(name = "gukseAmt", desc.qname("", name), "long", false), + desc.field(name = "gigumAmt", desc.qname("", name), "long", false), + desc.field(name = "gasanAmt", desc.qname("", name), "long", false), + desc.field(name = "finalAmt", desc.qname("", name), "long", false), + desc.field(name = "totalAmt", desc.qname("", name), "long", false), + desc.field(name = "taxGubun", desc.qname("", name), "string", true), desc.field(name = "taxGubunNm", desc.qname("", name), "string", true), desc.field(name = "taxNo", desc.qname("", name), "string", true), diff --git a/src/main/java/cokr/xit/interfaces/sntris/prenotice/SntrPreNoticeWebServiceLocator.java b/src/main/java/cokr/xit/interfaces/sntris/prenotice/SntrPreNoticeWebServiceLocator.java index 50bea36..9c3db93 100644 --- a/src/main/java/cokr/xit/interfaces/sntris/prenotice/SntrPreNoticeWebServiceLocator.java +++ b/src/main/java/cokr/xit/interfaces/sntris/prenotice/SntrPreNoticeWebServiceLocator.java @@ -107,8 +107,7 @@ public class SntrPreNoticeWebServiceLocator extends Service implements SntrPreNo String inputPortName = portName.getLocalPart(); if ("SntrPreNoticeWSPort".equals(inputPortName)) { return getSntrPreNoticeWSPort(); - } - else { + } else { Remote _stub = getPort(serviceEndpointInterface); ((Stub) _stub).setPortName(portName); return _stub;