changed by sumit on 25/03/13 for bug of deallocation IN PICK_ISS

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

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

@@ -3279,21 +3279,31 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 			}	
 			else
 			{
-				/*sql = "SELECT LOC_CODE FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
+				sql = "UPDATE REPL_ORD_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO = ?";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1,refId);
-				pstmt.setInt(2, pickLineNo);
-				rs = pstmt.executeQuery();
-				if( rs.next())
+				pstmt.setDouble(1, DeallocQty );				
+				pstmt.setString(2, refId);
+				pstmt.setInt(3, pickLineNo);
+				//pstmt2.setInt(3, pickLineNo);				
+				if( pstmt.executeUpdate() > 0 )
 				{
-					locCode = rs.getString("");
-				}
-				rs.close(); rs = null;
-				pstmt.close(); pstmt = null;*/
-				/*stockDetail.put("loc_code", locCode);
-				stockDetail.put("ref_id", refId);
-				stockDetail.put("ref_line_no", pickLineNo);*/
-				//confStockToDockReplOrder(refId, pickLineNo,pickType, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
+					System.out.println(refId+" repl_order OF REPL_ORD_DET updated successfully ");
+				}			
+				pstmt.close();pstmt = null;
+				
+				sql = "UPDATE REPL_ISS_DET SET DEALLOC_QTY = (CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END + ?) WHERE REPL_ORDER = ? AND LINE_NO__ORD = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setDouble(1, DeallocQty );				
+				pstmt.setString(2, refId);
+				pstmt.setInt(3, pickLineNo);
+				//pstmt2.setInt(3, pickLineNo);
+				
+				if( pstmt.executeUpdate() > 0 )
+				{
+					System.out.println(refId+" repl_order OF REPL_ISS_DET updated successfully ");
+				}			
+				pstmt.close();pstmt = null;
+				//updateReplOrder(refId, pickLineNo,pickType, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
 			}
 			System.out.println(" final locCode ["+locCode+"]");
 			

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

@@ -496,7 +496,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						
 						sql = " SELECT DISTINCT POD.REPL_ORDER FROM PICK_ORD_DET POD, REPL_ORD_DET ROD WHERE  POD.PICK_ORDER= ? " +
 								" AND ROD.REPL_ORDER IS NOT NULL AND POD.REPL_ORDER = ROD.REPL_ORDER " +
-								" AND (CASE WHEN ROD.CANCEL_MODE IS NULL THEN 'N' ELSE ROD.CANCEL_MODE END) <> 'Y'";
+								" AND (CASE WHEN ROD.CANCEL_MODE IS NULL THEN 'N' ELSE ROD.CANCEL_MODE END) <> 'Y'" +
+								" AND (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END ) > 0 ";
 
 						pstmt = conn.prepareStatement( sql );
 						pstmt.setString( 1, pickOrder );