change validation for qty

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

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

 /*
     Window Name : w_sord_dealloc
     Dharmendra Debata
-*/
+ */
 
 package ibase.webitm.ejb.dis;
 
@@ -484,7 +484,7 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 						//gtin_unit
 
 						retTabSepStrBuff.append("<gtin_unit>").append("<![CDATA[" + (rs.getString(14)== null ?"": rs.getString(14)) +"]]>").append("</gtin_unit>");
-//LOT_NO
+						//LOT_NO
 
 						retTabSepStrBuff.append("<lot_no>").append("<![CDATA[" + rs.getString(8) +"]]>").append("</lot_no>");
 						//LOT_SL
@@ -749,7 +749,7 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 		String lotNo = " " ;
 		String tranId=" ";
 		String allocLineno=" ";
-		double DeallocQty = 0;
+		double DeallocQty = 0 ,totDeallocQty = 0;
 		double quantity = 0;
 		String errString = " ";
 		//Changed by sumit on 27/11/12 
@@ -880,6 +880,11 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 						}
 
 					}
+					if (childNodeName.equals("tot_alloc_qty"))
+					{
+						totDeallocQty = Double.parseDouble(childNode.getFirstChild().getNodeValue());
+						System.out.print("Total  DeallocQty::::"+ totDeallocQty );
+					}
 
 				}//inner for loop
 
@@ -896,7 +901,7 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 				if("N".equalsIgnoreCase(activeAllow))
 				{
 					String sql1 = "";
-					 double shipperSize = 0;
+					double shipperSize = 0 ,qtyDiff = 0;
 					sql1 = "select shipper_size from item_lot_packsize where item_code = ? ";
 					pstmt = conn.prepareStatement(sql1);
 					pstmt.setString(1,itemCode);
@@ -907,13 +912,28 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 					}
 					pstmt.close();pstmt = null;
 					rs.close();rs = null;
+					
+					qtyDiff =  totDeallocQty -DeallocQty;
+					System.out.println("qtyDiff:::"+qtyDiff);
+					
 					try{
 
-							 if(DeallocQty % shipperSize != 0)
+						/*if(DeallocQty % shipperSize != 0)
 						{
 							flag = true;
 							errString = itmDBAccessEJB.getErrorString("","VTACTALW2","","",conn);
 							System.out.println("==activeAllow validate 4 N =="+errString);
+						}*/
+						if(qtyDiff < 0)
+						{
+							System.out.println("skip");
+							continue;
+						}
+						if(qtyDiff % shipperSize != 0) //added by kunal on on 18/dec/13 check for remaining Qty
+						{
+							System.out.println("error..");
+							flag = true;
+							errString = itmDBAccessEJB.getErrorString("","VTACTALW2","","",conn);
 						}
 					}
 					catch(Exception ex)
@@ -932,10 +952,11 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 						elements ++;
 					}
 					
+
 				}		//added by ritesh on 10/10/13 for request DI3GSUN017 END
 
 
-// added by cpatil on 27/11/13 as per manoj sir instruction start
+				// added by cpatil on 27/11/13 as per manoj sir instruction start
 
 				if( saleOrder != null && saleOrder.trim().length() > 0 )
 				{
@@ -1078,7 +1099,7 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 				String mainStr = begPart + "Following error has occured\n" ;
 				if(elements > 0 )
 				{ 
-					mainStr	= mainStr + "Invalid quantity,Entered quantity is not in multiple of Case/shipper Quantity.\n";
+					mainStr	= mainStr + "Invalid quantity,Remaining quantity after deallocation is not in multiple of Case/shipper Quantity.\n";
 				}
 				for(int i = 0; i < elements * 4;i++)
 				{