Several Values set on edit, frt amt set to 0 in add, status set as 1 space,...

Several Values set on edit, frt amt set to 0 in add, status set as 1 space, lock code set commented, unit set despatchdet


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

webitm-dis/ibase/webitm/ejb/dis/DespatchWiz.java

@@ -768,6 +768,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",stanCodeInit="",status="",statusRemarks="",despIdNew="",natureLinkType="",
 				custCodeBil="",dlvAdd1="",dlvAdd2="",dlvAdd3="",despId="",remarksDes="",noArtDes="",sorderNo="",
 				siteCodeShip="",availableYn="",addUser="",chgUserL="",chgTermL="",lotslL="",lotStatus="HOLD";
+		String effDate = "",confirm = "", chgDate = "", licnNo = "", licnNo1 ="", licnNo2 = "", licnNo3 ="",
+					licnDate1= "", licnDate2 = "", licnDate3 = "", availYN = "" ;		// Added by sandesh 2-Oct-2014
+		double insuranceAmt = 0, frghtAmt = 0;											// Added by sandesh 2-Oct-2014
+		
 		ArrayList<String> addUsersList=new ArrayList<String>();
 		Date orderDt = null,statusDate=null,mfgDate=null,expiryDate=null,sOrdDate=null,retestDate=null;
 		try
@@ -855,7 +859,9 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									sql="select d.desp_id,d.site_code,d.desp_date,d.curr_code,d.exch_rate,d.trans_mode,d.curr_code__frt,d.curr_code__ins,d.stan_code,"
 											+ "d.state_code__dlv,d.dlv_city,d.dlv_pin,d.count_code__dlv,d.dlv_add1,d.dlv_add2,d.dlv_add3,"
 											+ "d.tran_code,d.stan_code__init,d.status,d.status_remarks,d.remarks,d.no_art,d.status_date,d.cust_code,d.cust_code__dlv,"
-											+ "s.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date,d.gross_weight,d.nett_weight,d.tare_weight,d.no_art"
+											+ "s.site_code__ship,s.CHG_USER,s.CHG_TERM, s.order_date,d.gross_weight,d.nett_weight,d.tare_weight,d.no_art,"
+											+ "d.eff_date,d.confirmed,d.chg_date,d.chg_term,d.chg_user,d.licence_no,d.licence_no_1,d.licence_no_2,d.licence_no_3,"	// Sandesh 2-Oct-2014
+											+ "d.licence_date_1,d.licence_date_2,d.licence_date_3,d.available_yn,d.insurance "							// Sandesh 2-Oct-2014
 											+ " from despatch d,sorder s where d.sord_no = ? and d.sord_no = s.sale_order  and d.add_user = ?";
 
 									pstmt=conn.prepareStatement(sql);
@@ -882,6 +888,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 										tranCode = checkNull(rs.getString("tran_code"));
 										stanCodeInit = checkNull(rs.getString("stan_code__init"));
 										status = checkNull(rs.getString("status"));
+										
+										//---- Added by Sandesh 2-Oct-2014  -
+										if(status.equals("")){
+											
+											status = " ";
+										}
+										// -----------------------
+										
 										statusRemarks = checkNull(rs.getString("status_remarks"));
 										statusDate = rs.getDate("status_date");
 										custCode=checkNull(rs.getString("cust_code"));
@@ -898,6 +912,34 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 										grossWeight=rs.getDouble("gross_weight");
 										netWeight=rs.getDouble("nett_weight");
 										tareWeight=rs.getDouble("tare_weight");
+										
+										//------- Added by Sandesh 2-Oct-2014  -------
+										
+										effDate = rs.getDate("EFF_DATE"); 
+										confirm = checkNull(rs.getString("CONFIRMED"));
+										chgDate = rs.getDate("CHG_DATE"); 
+										//chgTerm = checkNull(rs.getString("CHG_TERM"));
+										//chgUsr  = checkNull(rs.getString("CHG_USER")); 
+										licnNo  = checkNull(rs.getString("LICENCE_NO"));
+										licnNo1 = checkNull(rs.getString("LICENCE_NO_1"));
+										licnNo2 = checkNull(rs.getString("LICENCE_NO_2"));
+										licnNo3 = checkNull(rs.getString("LICENCE_NO_3"));
+										licnDate1 = rs.getDate("LICENCE_DATE_1");
+										licnDate2 = rs.getDate("LICENCE_DATE_2");
+										licnDate3 = rs.getDate("LICENCE_DATE_3");
+										availYN = checkNull(rs.getString("AVAILABLE_YN")); 
+										insuranceAmt = rs.getDouble("INSURANCE");
+										frghtAmt = rs.getDouble("FREIGHT");
+										
+										System.out.println("\n New values -> ");
+										
+										System.out.println("\n effDate : "+effDate+" confirm : "+confirm+" chgDate : "+chgDate+" licnNo : "+licnNo+" frghtAmt : "+frghtAmt);
+										System.out.println("\n licnNo1 : "+licnNo1+" licnNo2 : "+licnNo2+" licnNo3 : "+licnNo3+" insuranceAmt : "+insuranceAmt);
+										System.out.println("\n licnDate1 : "+licnDate1+" licnDate2 : "+licnDate2+" licnDate3 : "+licnDate3+" availYN : "+availYN);
+										
+										// ------------------------------
+										
+										
 									}
 									if(rs!=null){
 									rs.close();
@@ -974,9 +1016,39 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 									valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
 									valueXmlString.append("<add_date>").append("<![CDATA[" + currAppdate + "]]>").append("</add_date>");
 									
+									//---------- Added by Sandesh 2-Oct-2014  ---------
+									
+									if(effDate!=null){
+										valueXmlString.append("<eff_date>").append("<![CDATA[" + simpleDateFormat.format(effDate).toString()+ "]]>").append("</eff_date>");
+									}
+									 
+									valueXmlString.append("<confirmed>").append("<![CDATA[" + confirm + "]]>").append("</confirmed>");
+									
+									if(chgDate!=null){
+										valueXmlString.append("<chg_date><![CDATA["+ simpleDateFormat.format(chgDate).toString() +"]]></chg_date>");
+									}
 									
+									valueXmlString.append("<licence_no_1><![CDATA["+ licnNo1 +"]]></licence_no_1>");
+									valueXmlString.append("<licence_no_2><![CDATA["+ licnNo2 +"]]></licence_no_2>");
+									valueXmlString.append("<licence_no_3><![CDATA["+ licnNo3 +"]]></licence_no_3>");
 									
+									if(licenceDate1!=null){		
+										valueXmlString.append("<licence_date_1><![CDATA["+  simpleDateFormat.format(licnDate1).toString()+"]]></licence_date_1>");
+									}	
+									if(licenceDate2!=null){		
+										valueXmlString.append("<licence_date_2><![CDATA["+  simpleDateFormat.format(licnDate2).toString()+"]]></licence_date_2>");
+									}	
+									if(licenceDate3!=null){		
+										valueXmlString.append("<licence_date_3><![CDATA["+  simpleDateFormat.format(licnDate3).toString()+"]]></licence_date_3>");
+									}	
 									
+									valueXmlString.append("<available_yn><![CDATA["+ availYN +"]]></available_yn>");
+
+									valueXmlString.append("<insurance><![CDATA["+ insuranceAmt +"]]></insurance>");
+									
+									valueXmlString.append("<freight><![CDATA["+ frghtAmt +"]]></freight>");	
+									//-------------------------------------------------
+								
 									valueXmlString.append("</Detail2>");
 									
 								}
@@ -1487,7 +1559,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					}		
 					
 					qcLockValueL=checkNull(getColumnDescr(conn, "var_value", "disparm", "var_name", "QUARNTINE_LOCKCODE"));					
-					valueXmlString.append("<lock_code><![CDATA["+ qcLockValueL +"]]></lock_code>");
+					//valueXmlString.append("<lock_code><![CDATA["+ qcLockValueL +"]]></lock_code>");		// Commented by Sandesh 
 					valueXmlString.append("<status><![CDATA["+ statusL +"]]></status>");
 					valueXmlString.append("<cost_rate><![CDATA["+ costRate +"]]></cost_rate>");
 					
@@ -1687,7 +1759,9 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					valueXmlString.append("<tot_net_amt><![CDATA["+ netTotAmt.trim()+"]]></tot_net_amt>");					
 					valueXmlString.append("<site_code><![CDATA["+ siteCodeDet.trim()+"]]></site_code>");
 					
-					valueXmlString.append("<unit><![CDATA["+ unit+"]]></unit>");
+					//valueXmlString.append("<unit><![CDATA["+ unit+"]]></unit>");		// Commented by Sandesh 2-Oct-2014 
+					valueXmlString.append("<unit><![CDATA["+ unit1+"]]></unit>");		// Added by Sandesh 2-Oct-2014 
+					
 					valueXmlString.append("<unit__rate><![CDATA["+ unitRate +"]]></unit__rate>");
 					valueXmlString.append("<unit__std><![CDATA["+ unitStd+"]]></unit__std>");
 					
@@ -1999,7 +2073,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		valueXmlString.append("<remarks2><![CDATA["+ remarks2 +"]]></remarks2>");
 		valueXmlString.append("<remarks3><![CDATA["+ remarks3 +"]]></remarks3>");
 		
-		valueXmlString.append("<freight><![CDATA["+ frtAmt +"]]></freight>"); 
+		//valueXmlString.append("<freight><![CDATA["+ frtAmt +"]]></freight>");			// Commented by Sandesh 2-Oct-2014 
+		valueXmlString.append("<freight><![CDATA[0]]></freight>");					// Added by Sandesh 2-Oct-2014 
 		valueXmlString.append("<insurance><![CDATA["+ insurance +"]]></insurance>");
 		
 		valueXmlString.append("<confirmed><![CDATA["+ confirmed +"]]></confirmed>");