add confirmed

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

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

@@ -1141,6 +1141,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				         +"despatchdet.gross_weight,despatchdet.tare_weight, "   
 				         +"despatchdet.nett_weight,despatchdet.dimension, "   
 				         +"despatchdet.tax_amt,despatchdet.disc_amt, "
+				         +"despatchdet.chg_term,despatchdet.chg_user, "
+				         
 				         +"despatchdet.conf_diff_amt,despatchdet.rate__std, "   
 				         +"despatchdet.cost_rate,'' as qty_details, "  
 				         +"despatchdet.line_type,0 as tot_net_amt, "
@@ -1187,7 +1189,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					
 					
 										
-					valueXmlString.append("<rate><![CDATA["+rate +"]]></rate>");					
+					//valueXmlString.append("<rate><![CDATA["+rate +"]]></rate>");					
 					valueXmlString.append("<item_code__ord><![CDATA["+ checkNull(rs.getString("item_code__ord")) +"]]></item_code__ord>");					
 					itemCode=checkNull(rs.getString("item_code"));
 					valueXmlString.append("<item_code><![CDATA["+itemCode+"]]></item_code>");
@@ -1237,6 +1239,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					valueXmlString.append("<pallet_wt><![CDATA["+ (rs.getDouble("pallet_wt")) +"]]></pallet_wt>");
 					
 					
+					valueXmlString.append("<chg_user><![CDATA["+ checkNull(rs.getString("chg_user")) +"]]></chg_user>");
+					valueXmlString.append("<chg_term><![CDATA["+checkNull(rs.getString("chg_term")) +"]]></chg_term>");
+					
+					
 					//for hold status Start
 					
 					sql = "select hold_qty from stock where site_code = ? and lot_sl = ? and quantity > 0";
@@ -1446,6 +1452,10 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					valueXmlString.append("<pack_instr><![CDATA["+ packInstr+"]]></pack_instr>");
 					valueXmlString.append("<dimension><![CDATA["+ dimension+"]]></dimension>");
 					
+					valueXmlString.append("<chg_user><![CDATA["+ chgUser +"]]></chg_user>");
+					valueXmlString.append("<chg_term><![CDATA["+ chgTerm +"]]></chg_term>");
+					valueXmlString.append("<chg_date><![CDATA["+ currAppdate +"]]></chg_date>");					
+					
 					System.out.println("squantity------>>["+squantity+"]");
 					System.out.println("holdQty------>>["+holdQty+"]");
 					System.out.println("allocQty------>>["+allocQty+"]");
@@ -1582,7 +1592,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					pstmt = null;
 					rs = null;
 				  
-					inputQty=quantity;
+					inputQty=actualQty;
 					
 				   //System.out.println("lnNoSord lotSl item change@#-------->>["+lnNoSord+"]"); 
 				   if (!unit1.equals(unitStd1))
@@ -1590,14 +1600,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						{
 							System.out.println("Calling getConvQuantity...........");
 							System.out.println("unitStd1 :"+unitStd1+" \nunit1 :"+unit1+" \nitemCode :"+itemCode+" \nqtyStd :"+quantity+" \nconv :"+conv); 
-							qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, quantity, conv, conn);
+							qtyFact = distCommon.getConvQuantityFact(unitStd1, unit1, itemCode, actualQty, conv, conn);
 							System.out.println("qtyFact.get(1) :"+qtyFact.get(1));
 							System.out.println("qtyFact.get(1) :"+qtyFact.get(2));
 						}
 						else
 						{
 							qtyFact.add(Integer.toString(1));
-							qtyFact.add(Double.toString(quantity));
+							qtyFact.add(Double.toString(actualQty));
 						}
 					System.out.println("qtyFact.size() :"+qtyFact.size());
 					conv = (Double.parseDouble(qtyFact.get(0).toString()));
@@ -1704,9 +1714,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					
 					//Addd New End
 					//Sale order data [END]
-					valueXmlString.append("<chg_user><![CDATA["+ chgUser +"]]></chg_user>");
-					valueXmlString.append("<chg_term><![CDATA["+ chgTerm +"]]></chg_term>");
-					valueXmlString.append("<chg_date><![CDATA["+ currAppdate +"]]></chg_date>");					
+					
 					
 					valueXmlString.append("</Detail3>");
 					
@@ -1865,7 +1873,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		 String sql="",siteCode="",currencyCode="",exchRate1="",transMode="",currCodeFrt="",currCodeIns="",stanCode="",stanCodeDlv="";
 		 String dlvCity="",dlvPin="",countCodeDlv="",tranCode="",stanCodeInit="",status="",statusRemarks="",custCode="",custCodeDlv="";
 		 String custCodeBil="",siteCodeShip="",dlvAdd1="",dlvAdd2="",dlvAdd3="",siteCodeDesc="",tranName="",currAppdate="",availableYn="",
-				 remarks2="",remarks3="",remarks="",licenceNo1="",licenceNo2="",licenceNo3="",orderType="",gpSer="";
+				 remarks2="",remarks3="",remarks="",licenceNo1="",licenceNo2="",licenceNo3="",orderType="",gpSer="",confirmed="N";
 		 Date orderDt=null,statusDate=null,licenceDate1=null,licenceDate2=null,licenceDate3=null;
 		System.out.println("--------no data found in Despatch-------------");
 		System.out.println("chgUser567-------->>["+chgUser+"]");
@@ -1991,8 +1999,10 @@ 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>"); 
 		valueXmlString.append("<insurance><![CDATA["+ insurance +"]]></insurance>");
+		
+		valueXmlString.append("<confirmed><![CDATA["+ confirmed +"]]></confirmed>");
 		;