W15GSUN002 changed by wasim to update source

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

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

@@ -188,6 +188,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 					}
 					else
 					{
+						//Changed by wasim on 09-11-2015 for taking data from stock and distorderalloc join.
 						//sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,UNIT,LOT_NO,LOT_SL,MFG_DATE,EXP_DATE,LOC_CODE,SITE_CODE__MFG FROM DISTORDER_ALLOC WHERE DIST_ORDER = ?";
 						sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.UNIT,D.LOT_NO,D.LOT_SL,S.SITE_CODE,D.LOC_CODE,S.NO_ART,S.QTY_PER_ART"
 								+" FROM STOCK S,DISTORDER_ALLOC D,DISTORDER H WHERE" 
@@ -246,6 +247,20 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							System.out.println("Quantity["+quantity+"]ShipperSize["+shipperSize+"]noArtQuot["+noArtQuot+"]"
 									+ "noArtRem["+noArtRem+"]notArt["+notArt+"]TotalQuantity["+totalQuantity+"]");*/
 							
+							noArtQuot= quantity / qtyPerArt ;
+							noArtRem = quantity % qtyPerArt ;
+							if(noArtRem > 0)
+							{
+								noArtRem = 1;
+							}
+							noArtQuot = (int) noArtQuot;
+							
+							notArt = noArtQuot + noArtRem;
+							totalQuantity = notArt * qtyPerArt;
+							
+							System.out.println("Quantity["+quantity+"]ShipperSize["+qtyPerArt+"]noArtQuot["+noArtQuot+"]"
+									+ "noArtRem["+noArtRem+"]notArt["+notArt+"]TotalQuantity["+totalQuantity+"]");
+							
 							interfaceHmap.put("TRAN_ID", "");
 							interfaceHmap.put("ITEM_CODE", itemCode);
 							interfaceHmap.put("DESCR", "");
@@ -260,7 +275,7 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							interfaceHmap.put("LOT_SL", lotSl);
 							interfaceHmap.put("QUANTITY", String.valueOf(notArt));
 							interfaceHmap.put("QTY_PER_ART", String.valueOf(qtyPerArt));
-							interfaceHmap.put("TOTAL_QTY", String.valueOf(quantity));
+							interfaceHmap.put("TOTAL_QTY", String.valueOf(totalQuantity));
 							System.out.println("exp_date="+expDate);
 							System.out.println("Mfg_date="+mfgDate);
 							interfaceHmap.put("EXP_DATE", "");	
@@ -312,6 +327,21 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 								notArt  = rs.getDouble("NO_ART");
 								qtyPerArt  = rs.getDouble("QTY_PER_ART");
 								
+								
+								noArtQuot= quantity / qtyPerArt ;
+								noArtRem = quantity % qtyPerArt ;
+								if(noArtRem > 0)
+								{
+									noArtRem = 1;
+								}
+								noArtQuot = (int) noArtQuot;
+								
+								notArt = noArtQuot + noArtRem;
+								totalQuantity = notArt * qtyPerArt;
+								
+								System.out.println("Quantity["+quantity+"]ShipperSize["+qtyPerArt+"]noArtQuot["+noArtQuot+"]"
+										+ "noArtRem["+noArtRem+"]notArt["+notArt+"]TotalQuantity["+totalQuantity+"]");
+								
 								HashMap interfaceHmap = new HashMap();
 								
 								interfaceHmap.put("TRAN_ID", "");
@@ -515,6 +545,20 @@ public class PalletRequisitionActEJB extends ActionHandlerEJB implements PalletR
 							totalQuantity = notArt * shipperSize;
 							System.out.println("Quantity["+quantity+"]ShipperSize["+shipperSize+"]noArtQuot["+noArtQuot+"]"
 									+ "noArtRem["+noArtRem+"]notArt["+notArt+"]TotalQuantity["+totalQuantity+"]");*/
+							
+							noArtQuot= quantity / qtyPerArt ;
+							noArtRem = quantity % qtyPerArt ;
+							if(noArtRem > 0)
+							{
+								noArtRem = 1;
+							}
+							noArtQuot = (int) noArtQuot;
+							
+							notArt = noArtQuot + noArtRem;
+							totalQuantity = notArt * qtyPerArt;
+							
+							System.out.println("Quantity["+quantity+"]ShipperSize["+qtyPerArt+"]noArtQuot["+noArtQuot+"]"
+									+ "noArtRem["+noArtRem+"]notArt["+notArt+"]TotalQuantity["+totalQuantity+"]");
 				
 							HashMap interfaceHmap = new HashMap();