changed by sumit on 23/03/13 for bug of deallocation

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

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

@@ -3293,7 +3293,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				/*stockDetail.put("loc_code", locCode);
 				stockDetail.put("ref_id", refId);
 				stockDetail.put("ref_line_no", pickLineNo);*/
-				//updateReplOrder(refId, pickLineNo,pickType, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
+				//confStockToDockReplOrder(refId, pickLineNo,pickType, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn, true, "", 0,"",0);
 			}
 			System.out.println(" final locCode ["+locCode+"]");
 			
@@ -3331,7 +3331,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				}
 				pstmt.close(); pstmt = null;
 				
-				sql = "UPDATE CARTON_MASTER SET STATUS = 'R' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
+				/*sql = "UPDATE CARTON_MASTER SET STATUS = 'R' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, refId);	
 				pstmt.setInt(2, pickLineNo);
@@ -3339,15 +3339,26 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				{
 					System.out.println(" CARTON_MASTER updated succesfully ");
 				}
-				pstmt.close(); pstmt = null;
+				pstmt.close(); pstmt = null;*/
 				
 			}
 			
+			sql = "UPDATE CARTON_MASTER SET STATUS = 'R' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, refId);	
+			pstmt.setInt(2, pickLineNo);
+			if ( pstmt.executeUpdate() > 0 )
+			{
+				System.out.println(" CARTON_MASTER updated succesfully ");
+			}
+			pstmt.close(); pstmt = null;
+			
 			if (errString != null && errString.trim().length() > 0)
 			{
 				System.out.println("errString :"+errString);
 				return errString;
 			}
+			
 		}
 		catch(Exception e)
 		{

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

@@ -490,8 +490,13 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						}
 
 						//End changes by gulzar on 1/12/2012
-						sql = "SELECT DISTINCT REPL_ORDER FROM PICK_ORD_DET "
-								+ "WHERE  PICK_ORDER= ? AND REPL_ORDER IS NOT NULL";
+						//Changed by sumit on 23/03/13 changed sql
+						/*sql = "SELECT DISTINCT REPL_ORDER FROM PICK_ORD_DET "
+								+ "WHERE  PICK_ORDER= ? AND REPL_ORDER IS NOT NULL";*/
+						
+						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'";
 
 						pstmt = conn.prepareStatement( sql );
 						pstmt.setString( 1, pickOrder );

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

@@ -290,7 +290,10 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 					//end by kunal
 
 					//select no of art from pick_ord_det 
-					sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ?";
+					//Changed by sumit on 18/03/13 adding condition 
+					//sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
+					sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ? " +
+						  "AND (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) > 0 ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString( 1, pickOrder );
 					rs = pstmt.executeQuery();
@@ -302,7 +305,10 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 					pstmt.close(); pstmt = null;
 
 					//select the no of order scanned 
-					sql = "SELECT SUM(NO_ART) AS COUNT FROM PICK_ISS_DET WHERE PICK_ORDER = ? ";
+					//Changed by sumit on 18/03/13 adding condition 
+					//sql = "SELECT SUM(NO_ART) AS COUNT FROM PICK_ISS_DET WHERE PICK_ORDER = ? ";
+					sql = "SELECT SUM(NO_ART) AS COUNT FROM PICK_ISS_DET WHERE PICK_ORDER = ? " +
+							" AND (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) > 0 ";
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, pickOrder );
 					rs = pstmt.executeQuery();