Pick Issue Bug as found

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

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

@@ -522,6 +522,15 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 							pstmt1 = null;
 				
 							
+					//Changed By Pragyan19/12/12.start
+					sSQL = "SELECT COUNT(*) AS COUNT FROM SORDALLOC WHERE " 
+							+ " SALE_ORDER = ? AND LINE_NO = ? "
+							+ " AND ITEM_CODE = ? "
+							+ " AND LOC_CODE = ? "
+							+ " AND LOT_NO = ? "
+							+ " AND LOT_SL = ? ";
+					int count = 0;
+					
 					if(sordAllocQty > quantity)
 					{
 							updateSql = "UPDATE SORDALLOC SET   QTY_ALLOC = QTY_ALLOC - ? " //LOC_CODE = ? ,LOT_SL = ? "
@@ -549,7 +558,66 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 								expLev = dExpLev;
 							}
 							System.out.println("Finally the Exp level["+expLev+"]");
+							//Changed By Pragyan 17/12/12.start
+							
+							pstmtSord = conn.prepareStatement(sSQL);
+							pstmtSord.setString(1, saleOrder);
+							pstmtSord.setString(2, lineNoSord);				
+							pstmtSord.setString(3, itemCode);				
+							if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
+							{
+								pstmtSord.setString(4, stagingLoc);
+							}
+							else
+							{	
+								pstmtSord.setString(4, locCodeTo);
+							}				
+							pstmtSord.setString(5, lotNo);				
+							pstmtSord.setString(6, lotSl);				
+		
+							rsSord = pstmtSord.executeQuery();
+							
+							if(rsSord.next())
+							{
+								count = rsSord.getInt(1);
+							}
+							
+							
+							if(count > 0)
+							{
+								
+									System.out.println("manohar 19/12/12 sordalloc If alrady exist Location Update Inside grater  updCnt1st [" + updCnt + "]");
+									
+									updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?"
+									+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
+									+ " AND ITEM_CODE = ? "
+									+ " AND LOC_CODE = ? "
+									+ " AND LOT_NO = ? "
+									+ " AND LOT_SL = ? "
+									+ " AND QTY_ALLOC > 0";
+									pstmtUpd = conn.prepareStatement(updateSql);
+									pstmtUpd.setDouble(1, quantity);
+									pstmtUpd.setDouble(2, quantity);
+									pstmtUpd.setString(3, saleOrder);
+									pstmtUpd.setString(4, lineNoSord);				
+									pstmtUpd.setString(5, itemCode);				
+									if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
+									{
+										pstmtUpd.setString(6, stagingLoc);
+									}
+									else
+									{	
+										pstmtUpd.setString(6, locCodeTo);
+									}				
+									pstmtUpd.setString(7, lotNo);				
+									pstmtUpd.setString(8, lotSl);				
 				
+									updCnt = pstmtUpd.executeUpdate();
+									System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update  Inside grater  updCnt2nd [" + updCnt + "]");
+							}
+							//Changed By Pragyan 17/12/12.end
+							else
+							{
 								updateSql = "insert into sordalloc( SALE_ORDER, LINE_NO, EXP_LEV, ITEM_CODE__ORD, "
 									+ " ITEM_CODE, LOT_NO, LOT_SL, LOC_CODE, ITEM_REF, QUANTITY, UNIT, "
 									+ " QTY_ALLOC, DATE_ALLOC, STATUS, ITEM_GRADE, EXP_DATE, ALLOC_MODE, SITE_CODE, "
@@ -595,27 +663,21 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 								updCnt = pstmtUpd.executeUpdate();
 								System.out.println("manohar 18/09/12 sordalloc inserted  updCnt [" + updCnt + "]");
 							}
+					}
 					else
 					{
 							//Changed By Pragyan19/12/12.start						
-							sSQL = "SELECT COUNT(*) AS COUNT FROM SORDALLOC WHERE " 
-									+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
-									+ " AND ITEM_CODE = ? "
-									+ " AND LOC_CODE = ? "
-									+ " AND LOT_NO = ? "
-									+ " AND LOT_SL = ? ";
-							int count = 0;
 							pstmtSord = conn.prepareStatement(sSQL);
 							pstmtSord.setString(1, saleOrder);
 							pstmtSord.setString(2, lineNoSord);				
 							pstmtSord.setString(3, itemCode);				
 							if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
 							{
-								pstmtUpd.setString(4, stagingLoc);
+								pstmtSord.setString(4, stagingLoc);
 							}
 							else
 							{	
-								pstmtUpd.setString(4, locCodeTo);
+								pstmtSord.setString(4, locCodeTo);
 							}				
 							pstmtSord.setString(5, lotNo);				
 							pstmtSord.setString(6, lotSl);				
@@ -657,20 +719,21 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 									+ " AND LOT_SL = ? "
 									+ " AND QTY_ALLOC > 0";
 									pstmtUpd = conn.prepareStatement(updateSql);
+									pstmtUpd.setDouble(1, quantity);
+									pstmtUpd.setDouble(2, quantity);
+									pstmtUpd.setString(3, saleOrder);
+									pstmtUpd.setString(4, lineNoSord);				
+									pstmtUpd.setString(5, itemCode);				
 									if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
 									{
-										pstmtUpd.setString(1, stagingLoc);
+										pstmtUpd.setString(6, stagingLoc);
 									}
 									else
 									{	
-										pstmtUpd.setString(1, locCodeTo);
+										pstmtUpd.setString(6, locCodeTo);
 									}				
-									pstmtUpd.setString(2, saleOrder);
-									pstmtUpd.setString(3, lineNoSord);				
-									pstmtUpd.setString(4, itemCode);				
-									pstmtUpd.setString(5, locCode);				
-									pstmtUpd.setString(6, lotNo);				
-									pstmtUpd.setString(7, lotSl);				
+									pstmtUpd.setString(7, lotNo);				
+									pstmtUpd.setString(8, lotSl);				
 				
 									updCnt = pstmtUpd.executeUpdate();
 									System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update  updCnt2nd [" + updCnt + "]");