update by sumit on 18/09/13 insertting rate__std and conv__rtuom_stduom in despatchdet

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

webitm-wms/ibase/webitm/ejb/wms/ConsolidatToDoc.java

@@ -74,6 +74,7 @@ public class ConsolidatToDoc {
 		double rate = 0d;
 		//Changed by sumit on 01/02/13 
 		double convertQty = 0.0;
+		double rateStd = 0.0;//added by sumit on 18/02/13
 		int noArt = 0;
 		double shipperSize = 0;
 		double totalGrossWeight = 0,totalTareWeight = 0,totalNetWeight = 0; 
@@ -143,8 +144,10 @@ public class ConsolidatToDoc {
 								"STATUS, CONV__QTY_STDUOM, UNIT__STD, UNIT, QUANTITY__STDUOM, QUANTITY_REAL, " +
 								"RATE__STDUOM, PACK_INSTR, NO_ART, SITE_CODE, PACK_QTY, GROSS_WEIGHT, TARE_WEIGHT,  " +
 								"NETT_WEIGHT, MFG_DATE, EXP_DATE, SITE_CODE__MFG, RATE__CLG, COST_RATE, LINE_TYPE, " +
-								"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO) " +
-								"VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?) ";  //chnage done by Kunal Mandhre insert pallet no as per S Manoharan Sir instruction 
+								//Changed by sumit on 18/02/13 adding rate__std column 
+								//"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO) " +
+								"CONV__RTUOM_STDUOM, PACK_CODE, CUST_ITEM__REF, RETEST_DATE, PART_NO,PALLET_NO,RATE__STD ) " +
+								"VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,?,?) ";  //chnage done by Kunal Mandhre insert pallet no as per S Manoharan Sir instruction 
 
 						pstmt1 = conn.prepareStatement(sql1);
 
@@ -200,8 +203,10 @@ public class ConsolidatToDoc {
 
 						sordSql = "SELECT PRICE_LIST FROM SORDER WHERE SALE_ORDER = ? ";
 						pstmtSord = conn.prepareStatement(sordSql);
-
-						sordDetSql = "SELECT PACK_INSTR, SITE_CODE, CUST_ITEM__REF, RATE, RATE__STDUOM, RATE__CLG, UNIT, CONV__QTY_STDUOM,UNIT__STD " +
+						
+						//Changed by sumit on 18/02/13 getting rate__std and conv__rtuom_stduom
+						//sordDetSql = "SELECT PACK_INSTR, SITE_CODE, CUST_ITEM__REF, RATE, RATE__STDUOM, RATE__CLG, UNIT, CONV__QTY_STDUOM,UNIT__STD " +
+						sordDetSql = "SELECT PACK_INSTR, SITE_CODE, CUST_ITEM__REF, RATE, RATE__STDUOM, RATE__CLG, UNIT, CONV__QTY_STDUOM,UNIT__STD, RATE__STD, CONV__RTUOM_STDUOM  " +
 								" FROM SORDDET WHERE SALE_ORDER = ? AND LINE_NO = ? ";
 						pstmtSordDet = conn.prepareStatement(sordDetSql);
 
@@ -522,6 +527,10 @@ public class ConsolidatToDoc {
 											convQtyStduom = rsSordDet.getDouble("CONV__QTY_STDUOM");
 											unitStd = checkNull(rsSordDet.getString("UNIT__STD"));
 											rate = rsSordDet.getDouble("RATE");//Gulzar on 5/14/2012
+											//Changed by sumit on 18/02/13 getting rate__std and conv__rtuom_stduom start
+											rateStd = rsSordDet.getDouble("RATE__STD");
+											conRtuStduom = rsSordDet.getDouble("CONV__RTUOM_STDUOM");
+											//Changed by sumit on 18/02/13 getting rate__std and conv__rtuom_stduom end
 										}
 										rsSordDet.close();rsSordDet = null;
 										pstmtSordDet.clearParameters();
@@ -529,7 +538,7 @@ public class ConsolidatToDoc {
 										System.out.println("unit =["+unit+"]");
 										System.out.println("convQtyStduom =["+convQtyStduom+"]");
 										System.out.println("unitStd =["+unitStd+"]");
-										System.out.println("rate from sorddet =["+rate+"]");
+										System.out.println("rate from sorddet =["+rate+"] rateStd ["+rateStd+"] conRtuStduom["+conRtuStduom+"]");
 										String priceList = "";
 
 										if ( rate == 0 )
@@ -745,23 +754,25 @@ public class ConsolidatToDoc {
 												}
 												//Changed by sumit on 01/02/13 converting from stock unit to order unit end
 
-												if (conRtuStduom == 0)
+												//Changed by sumit on 18/02/13 commenting this and reciving conRtuStduom column value from sorddet start.
+												/*if (conRtuStduom == 0)
 												{
 													conRtuStduom= Double.parseDouble(convQtyList.get(0).toString());
-												}
-												
+												}*/
+												//Changed by sumit on 18/02/13 commenting this and reciving conRtuStduom column value from sorddet end.
 												
 											}
 											else
 											{
 												//Changed by sumit on 04/02/12 
 												convertQty = quantity;
-
-												if (conRtuStduom == 0) 
+												
+												//Changed by sumit on 18/02/13 commenting this and reciving conRtuStduom column value from sorddet start.
+												/*if (conRtuStduom == 0) 
 												{
 													conRtuStduom=1;
-												}
-
+												}*/
+												//Changed by sumit on 18/02/13 commenting this and reciving conRtuStduom column value from sorddet end.
 											}
 
 										}
@@ -841,7 +852,8 @@ public class ConsolidatToDoc {
 										pstmt1.setTimestamp( 36 ,retestDate);
 										pstmt1.setString( 37 , checkNull(partNo));
 										pstmt1.setString( 38 , checkNull(palletNo)); //added by Kunal Mandhre on 02/08/12 as per S Manoharan Sir intruction .
-
+										pstmt1.setDouble( 39 , rateStd);//added by sumit on 18/02/13 
+										
 										pstmt1.addBatch();
 										pstmt1.clearParameters();
 										System.out.println("lOOPPPPPPPPPPPPPPPPPPPPPP111");