Updated ecm-order and ecm-order-det bean

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174928 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/bean/ECMOrder.java

@@ -95,6 +95,9 @@ public class ECMOrder implements java.io.Serializable
 	@Column(name="CHG_TERM")
 	private String chgTerm;
 	
+	@Column(name="ECM_TYPE")
+	private String ecmType;
+	
 	@OneToMany(mappedBy="eorderNo", cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity= ECMOrderDet.class)
 	private List<ECMOrderDet> ecmOrderDets;
 	
@@ -104,7 +107,7 @@ public class ECMOrder implements java.io.Serializable
 
 	public ECMOrder(String orderNo, String userId, String ecmSite, String currCode, int exchRate , Date orderDate,
 			        String remark, String divAddress, String billAddress, int amount,int taxAmt, int discAmt,int promoAmt,
-			        int netAmt, String wfStat, Date wfStatDate, Date chgDATE, String chgUser,String chgTerm) {
+			        int netAmt, String wfStat, Date wfStatDate, Date chgDATE, String chgUser,String chgTerm, String ecmType) {
 		this.orderNo = orderNo;
 		this.userId = userId;
 		this.ecmSite = ecmSite;
@@ -124,6 +127,7 @@ public class ECMOrder implements java.io.Serializable
 		this.chgDATE = chgDATE;
 		this.chgUser = chgUser;
 		this.chgTerm = chgTerm;
+		this.ecmType=ecmType;
 
 	}
 
@@ -303,6 +307,15 @@ public class ECMOrder implements java.io.Serializable
 		this.chgTerm = chgTerm;
 	}
 	
+	public String getEcmType() {
+		return ecmType;
+	}
+
+	public void setEcmType(String ecmType) {
+		this.ecmType = ecmType;
+	}
+
+
 	@Override
 	public String toString(){
 		return "\n ECMOrder.toString >> [" + new JSONObject(this).toString() + "]";

ecm/webitm-ecm/trunk/proteus-ecm/proteus/ecm/hibernate/bean/ECMOrderDet.java

@@ -46,7 +46,7 @@ public class ECMOrderDet implements java.io.Serializable
 	private int rate;
 	 
 	@Column(name="DISC_PERC")	
-	private int discPerc;
+	private double discPerc;
 	
 	@Column(name="TAX_AMT")
 	private int taxAmt;
@@ -60,6 +60,9 @@ public class ECMOrderDet implements java.io.Serializable
 	@Column(name="TAX_ENV")	
 	private String taxEnv;
 	
+	@Column(name="NET_AMT")
+	private int netAmt;	
+	
 	@Column(name="ORD_STAT")
 	private String ordStat;
 			  
@@ -69,13 +72,19 @@ public class ECMOrderDet implements java.io.Serializable
 	@Column(name="STAT_REMARKS")	
 	private String statRemarks;
 	
+	@Column(name="SHIP_DATE")
+	private Date shipDate;
+	
+	@Column(name="DLV_DATE")
+	private Date dlvDate;
+
 
 	public ECMOrderDet() {
 	}
 	
 	public ECMOrderDet(String eorderNo, int lineNo, String itemCode, String promoCode, int quantity, int rate,
-			           int discPerc,int taxAmt, String taxChap, String taxClass, String taxEnv, String ordStat,
-			           Date statDate,String statRemarks) {
+			           double discPerc,int taxAmt, int netAmt,String taxChap, String taxClass, String taxEnv, String ordStat,
+			           Date statDate,String statRemarks, Date shipDate, Date dlvDate ) {
 		this.eorderNo = eorderNo;
 		this.lineNo = lineNo;
 		this.itemCode = itemCode;
@@ -90,8 +99,12 @@ public class ECMOrderDet implements java.io.Serializable
 		this.ordStat = ordStat;
 		this.statDate = statDate;
 		this.statRemarks = statRemarks;
+		this.shipDate = shipDate;
+		this.dlvDate = dlvDate;
+		this.netAmt= netAmt;
 	}
 
+
 	public String getEorderNo() {
 		return eorderNo;
 	}
@@ -140,11 +153,11 @@ public class ECMOrderDet implements java.io.Serializable
 		this.rate = rate;
 	}
 
-	public int getDiscPerc() {
+	public double getDiscPerc() {
 		return discPerc;
 	}
 
-	public void setDiscPerc(int discPerc) {
+	public void setDiscPerc(double discPerc) {
 		this.discPerc = discPerc;
 	}
 
@@ -180,6 +193,14 @@ public class ECMOrderDet implements java.io.Serializable
 		this.taxEnv = taxEnv;
 	}
 	
+	public int getNetAmt() {
+		return netAmt;
+	}
+
+	public void setNetAmt(int netAmt) {
+		this.netAmt = netAmt;
+	}
+
 	public String getOrdStat() {
 		return ordStat;
 	}
@@ -204,6 +225,24 @@ public class ECMOrderDet implements java.io.Serializable
 		this.statRemarks = statRemarks;
 	}
 	
+	 
+		 
+	public Date getShipDate() {
+	return shipDate;
+	}
+	
+	public void setShipDate(Date shipDate) {
+	this.shipDate = shipDate;
+	}
+	
+	public Date getDlvDate() {
+	return dlvDate;
+	}
+	
+	public void setDlvDate(Date dlvDate) {
+	this.dlvDate = dlvDate;
+	}
+
 	@Override
 	public String toString(){
 		return "\n ECMOrderDet.toString >> [" + new JSONObject(this).toString() + "]";