W15JSUN006 update despatchOrder for multiple line for sale order

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

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

@@ -244,7 +244,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		ArrayList locationList = new ArrayList();
 		ArrayList tranIdIssList = new ArrayList();
 		ArrayList DistStkList = new ArrayList();
-
+		ArrayList DespatchStkList = new ArrayList();
 		boolean isRecordExist = false;
 
 		try
@@ -491,9 +491,9 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					hashMap1.put("chg_win","W_STOCK_TRANSFER_MULTI");
 					hashMap1.put("chg_user", userId);
 					hashMap1.put("chg_term", chgTerm);
-
+					
 					System.out.println("COUNTD_SO="+countDso);
-					if("D-SO".equalsIgnoreCase(refSer) && countDso > 0 )
+					if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
 					{	
 						hashMap1.put("tran_type", rs.getString("TRAN_TYPE"));
 						hashMap1.put("line_no_dist", rs.getString("LINE_NO_DIST"));
@@ -522,7 +522,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 						hashMap1.put("tax_env", rs.getString("TAX_ENV"));
 						hashMap1.put("loc_code__to", locCodeTo);
 						DistStkList.add(hashMap1);
-					}	
+					}
+					if("S-ORD".equalsIgnoreCase(refSer))
+					{
+						DespatchStkList.add(hashMap1);
+					}
 					
 					if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer) || "D-SO".equalsIgnoreCase(refSer) || "S-ORD".equalsIgnoreCase(refSer))
 					{	
@@ -673,10 +677,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 							//errString = createDespatch(refId,lineNoList,conn);//VTCONPARM
 							errString = allocStockLocCodeTo(allocList,true,conn);
 							
+							updateLocation(locationList,conn);
+							
 							System.out.println("For s-ord after stock transfer connection need to be committed....so connection committed");
 							conn.commit();
 							System.out.println("Going for Despatch");
-							errString = despatchOrder(refId,lineNoList,xtraParams,locCodeTo,conn);
+							//errString = despatchOrder(refId,lineNoList,xtraParams,locCodeTo,conn);
+							errString = despatchOrder(refId,DespatchStkList,xtraParams,locCodeTo,conn);
 							System.out.println("Return from despatch"+errString);
 							
 							if( errString != null &&  errString.indexOf( "Success" ) > -1)
@@ -2805,15 +2812,29 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				
 			System.out.println("ArrayList size="+lineNoList.size());
 			
-			for(String lineNoInterface : lineNoList)
+			/*for(String lineNoInterface : lineNoList)
 			{  
 				System.out.println("Line["+lineNoInterface+"]");
 				lineNoInterface = "   " + lineNoInterface;
 				lineNoInterface = lineNoInterface.substring( lineNoInterface.length()-3 );
-				System.out.println("Inside First refId["+saleOrder+"]lineNumber=["+lineNoInterface+"]");
-				
-				//System.out.println("Loc Code inside Despatch Order="+lineNoInterface);
+				System.out.println("Inside First refId["+saleOrder+"]lineNumber=["+lineNoInterface+"]");*/
+			
+			String lineNoInterface = "";
+			Iterator itr = lineNoList.iterator();
+			System.out.println("Array Total size in despatchOrder="+lineNoList.size());
 
+			while(itr.hasNext())
+			{ 
+				HashMap stkMap = new HashMap();
+				stkMap = (HashMap) itr.next();
+				
+				lineNoInterface = (String) stkMap.get("ref_line");
+				itemCode = checkNullAndTrim((String) stkMap.get("item_code"));
+				siteCode = checkNullAndTrim((String) stkMap.get("site_code"));
+				//locCode = checkNullAndTrim((String) stkMap.get("loc_code"));
+				lotNo = checkNullAndTrim((String) stkMap.get("lot_no"));
+				lotSl = checkNullAndTrim((String) stkMap.get("lot_sl"));
+				
 				/*sql = "select line_no,item_code,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom," +
 						"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom,PACK_INSTR,NO_PALLET from sorddet where sale_order = ? order by line_no";*/
 				sql = "select s.quantity,s.item_code,s.lot_no,s.lot_sl,s.loc_code,s.gross_weight,s.tare_weight,s.net_weight,s.alloc_qty,s.exp_date,"
@@ -2826,16 +2847,28 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 						+" and h.sale_order = d.sale_order"
 						+" and d.sale_order = dt.sale_order"
 						+" and d.line_no = ?"
-						//+" and d.loc_code = ?"
 						+" and d.line_no = dt.line_no"
 						+" and s.item_code = d.item_code"
 						+" and s.lot_no = d.lot_no"
 						+" and s.lot_sl = d.lot_sl "
 						+" and s.loc_code = d.loc_code"
-						+" and s.site_code = d.site_code";
+						+" and s.site_code = d.site_code"
+				
+						+" and s.item_code = ?"
+						+" and s.site_code = ?"
+						+" and s.lot_no = ?"
+						+" and s.lot_sl = ?"
+						+" and s.loc_code = ?";
+
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,saleOrder);
 				pstmt.setString(2,lineNoInterface);
+				
+				pstmt.setString(3,itemCode);
+				pstmt.setString(4,siteCode);
+				pstmt.setString(5,lotNo);
+				pstmt.setString(6,lotSl);
+				pstmt.setString(7,locCode);
 				rs = pstmt.executeQuery();
 			   while( rs.next() )
 			   {