System is bring the location twice in cycle count

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

webitm-wms/ibase/webitm/utility/wms/PhysicalCountSchedule.java

@@ -208,12 +208,12 @@ public class PhysicalCountSchedule implements Schedule
 		java.sql.Date setHTodt=null;
 		int priority=1;
 		int workDay=0;
+		ArrayList<String> locationMap = new ArrayList<String>() ;
 		
 
 		try
 		{
-			//java.util.Date dt=new Date();
-			java.sql.Date  dt = new  java.sql.Date((new java.util.Date()).getTime());
+			java.util.Date dt=new Date();
 			todayDate=new java.util.Date();
 			java.sql.Timestamp ts=null;
 			GenericUtility genericUtility=GenericUtility.getInstance();
@@ -288,43 +288,36 @@ public class PhysicalCountSchedule implements Schedule
 				System.out.println(from1Half+"----"+to1Half);
 				System.out.println(from2Half+"----"+to2Half);
 				
-				if((dt.after(from1Quarter) || dt.toString().equals(from1Quarter.toString()) ) && (dt.before(to1Quarter) || dt.toString().equals(to1Quarter.toString()))) //change done by kunal on 31/12/12 add equal cond. as per manoj instruction  
+				if(dt.after(from1Quarter) && dt.before(to1Quarter))
 				{
 					//subSql=" AND TRAN_DATE BETWEEN  ";
 					setQFromdt=from1Quarter;
 					setQTodt=to1Quarter;
-					
 				}
-				if((dt.after(from2Quarter) || dt.toString().equals(from2Quarter.toString())) && (dt.before(to2Quarter) || dt.toString().equals(to2Quarter.toString())))
+				if(dt.after(from2Quarter) && dt.before(to2Quarter))
 				{
 					setQFromdt=from2Quarter;
 					setQTodt=to2Quarter;
-					
 				}
-				
-				if((dt.after(from3Quarter)|| dt.toString().equals(from3Quarter.toString()) ) && ( dt.before(to3Quarter) || dt.toString().equals(to3Quarter.toString())))
+				if(dt.after(from3Quarter) && dt.before(to3Quarter))
 				{
 					setQFromdt=from3Quarter;
 					setQTodt=to3Quarter;
-					
 				}
-				if((dt.after(from4Quarter) || dt.toString().equals(from4Quarter.toString())) && ( dt.before(to4Quarter) || dt.toString().equals(to4Quarter.toString())))
+				if(dt.after(from4Quarter) && dt.before(to4Quarter))
 				{
 					setQFromdt=from4Quarter;
 					setQTodt=to4Quarter;
-					
 				}
-				if((dt.after(from1Half) || dt.toString().equals(from1Half.toString())) && (dt.before(to1Half) || dt.toString().equals(to1Half.toString())))
+				if(dt.after(from1Half) && dt.before(to1Half))
 				{
 					setHFromdt=from1Half;
 					setHTodt=to1Half;
-					
 				}
-				if((dt.after(from2Half) || dt.toString().equals(from2Half.toString())) && (dt.before(to2Half) || dt.toString().equals(to2Half.toString())))
+				if(dt.after(from2Half) && dt.before(to2Half))
 				{
 					setHFromdt=from2Half;
 					setHTodt=to2Half;
-					
 				}
 				
 				queryString="select count(1) from PHYSCAN  where  tran_date=? and tran_type='A'";
@@ -468,7 +461,6 @@ public class PhysicalCountSchedule implements Schedule
 					
 					System.out.println("arrA---"+arrA.size());
 	//				
-					
 					queryString=" SELECT DISTINCT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE,CYCLE_CRITERIA,S.LTRAN_DATE,S.QUANTITY,S.UNIT FROM ITEM I, STOCK S,LOCATION L" +
 							//",INVTRACE T" +
 							",ITEM_LOT_PACKSIZE P WHERE ANALYSIS_CLASS='B' " +
@@ -738,7 +730,7 @@ public class PhysicalCountSchedule implements Schedule
 					
 					
 					
-					queryString=" SELECT DISTINCT T.ITEM_CODE,T.LOT_NO,T.LOT_SL,T.LOC_CODE,T.SITE_CODE,CYCLE_CRITERIA,0 QUANTITY,T.UNIT,I.ANALYSIS_CLASS FROM ITEM I,LOCATION L,INVTRACE T,ITEM_LOT_PACKSIZE P WHERE " +
+					queryString=" SELECT DISTINCT T.ITEM_CODE,T.LOT_NO,T.LOT_SL,T.LOC_CODE,T.SITE_CODE,CYCLE_CRITERIA,0 QUANTITY,T.UNIT,I.ANALYSIS_CLASS ,  T.TRAN_ID FROM ITEM I,LOCATION L,INVTRACE T,ITEM_LOT_PACKSIZE P WHERE " +
 							//" AND I.ITEM_CODE NOT IN (SELECT ITEM_CODE FROM PHYSCAN A,PHYSCANDET B WHERE A.TRAN_ID=B.TRAN_ID AND  ANALYSIS_CLASS='A' AND TO_CHAR(TRAN_DATE, 'MON/YYYY')=?  AND CASE WHEN B.STATUS IS NULL THEN 'N' ELSE B.STATUS END ='Y'  and A.tran_type='A') " +
 							//" AND S.ITEM_CODE = I.ITEM_CODE  AND S.LOC_CODE=L.LOC_CODE AND CYCLE_COUNT_REQD='Y' " +
 							//" AND S.ITEM_CODE=P.ITEM_CODE AND "+
@@ -746,7 +738,7 @@ public class PhysicalCountSchedule implements Schedule
 							"P.ITEM_CODE=T.ITEM_CODE AND T.LOT_NO BETWEEN P.LOT_NO__FROM AND P.LOT_NO__TO AND "+
 							//"  AND S.site_code=T.site_code and S.lot_no=T.lot_no and S.loc_code=T.loc_code and S.lot_sl=T.lot_sl " +
 							"  L.CYCLE_COUNT_REQD='Y' AND (T.qty_after=0 and T.tran_date=?) AND T.site_code = ? "+ //added by kunal add site code in cond. on 18/09/12 as par Manoj Sharma instruction 
-							"   ORDER BY CYCLE_CRITERIA,T.ITEM_CODE,T.LOT_NO,T.LOT_SL ";
+							"   ORDER BY  T.TRAN_ID DESC, CYCLE_CRITERIA,T.ITEM_CODE,T.LOT_NO,T.LOT_SL ASC";//change done by kunal on 14/01/12 change order by  
 					}
 					pstmt=conn.prepareStatement(queryString);
 					pstmt.setTimestamp(1,wTimeStamp);
@@ -755,6 +747,11 @@ public class PhysicalCountSchedule implements Schedule
 					while(rs.next())
 					{
 						rec++;
+						
+						
+						
+						if(!locationMap.contains((String)rs.getString("LOC_CODE").trim()))
+						{
 							insertItemProcess="insert into PHYSCANDET (TRAN_ID,LINE_NO,SITE_CODE,ITEM_CODE," +
 									"LOC_CODE,LOT_NO,LOT_SL,QUANTITY," +
 									"ANALYSIS_CLASS,PRIORITY_SEQ,CYCLE_CRITERIA,EMP_CODE__USER,UNIT) " +
@@ -776,6 +773,16 @@ public class PhysicalCountSchedule implements Schedule
 							pstmtInsert.executeUpdate();
 							pstmtInsert.close();
 							pstmtInsert=null;
+						}
+						else
+						{
+							System.out.println("not insert ..");
+							continue;
+						}
+						locationMap.add(rs.getString("LOC_CODE")==null?" ":rs.getString("LOC_CODE").trim());
+						
+						
+						
 					}
 					rs.close();
 					rs=null;