update by manoj sharma on 09/02/13 issue tracker point 144

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

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

@@ -229,6 +229,7 @@ public class PhysicalCountSchedule implements Schedule
 			
 			conn = getConnection();
 			conn.setAutoCommit(false);
+			//tranId=generateTranId("w_phy_item_scan",conn);
 			//Added by manoj dtd 05/02/2013 to generate tran id as per keystring
 			tranId=generateTranId("w_phy_item_scan",loginSiteCode,conn);	
 			
@@ -289,36 +290,43 @@ public class PhysicalCountSchedule implements Schedule
 				System.out.println(from1Half+"----"+to1Half);
 				System.out.println(from2Half+"----"+to2Half);
 				
-				if(dt.after(from1Quarter) && dt.before(to1Quarter))
+				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  
 				{
 					//subSql=" AND TRAN_DATE BETWEEN  ";
 					setQFromdt=from1Quarter;
 					setQTodt=to1Quarter;
+					
 				}
-				if(dt.after(from2Quarter) && dt.before(to2Quarter))
+				if((dt.after(from2Quarter) || dt.toString().equals(from2Quarter.toString())) && (dt.before(to2Quarter) || dt.toString().equals(to2Quarter.toString())))
 				{
 					setQFromdt=from2Quarter;
 					setQTodt=to2Quarter;
+					
 				}
-				if(dt.after(from3Quarter) && dt.before(to3Quarter))
+				
+				if((dt.after(from3Quarter)|| dt.toString().equals(from3Quarter.toString()) ) && ( dt.before(to3Quarter) || dt.toString().equals(to3Quarter.toString())))
 				{
 					setQFromdt=from3Quarter;
 					setQTodt=to3Quarter;
+					
 				}
-				if(dt.after(from4Quarter) && dt.before(to4Quarter))
+				if((dt.after(from4Quarter) || dt.toString().equals(from4Quarter.toString())) && ( dt.before(to4Quarter) || dt.toString().equals(to4Quarter.toString())))
 				{
 					setQFromdt=from4Quarter;
 					setQTodt=to4Quarter;
+					
 				}
-				if(dt.after(from1Half) && dt.before(to1Half))
+				if((dt.after(from1Half) || dt.toString().equals(from1Half.toString())) && (dt.before(to1Half) || dt.toString().equals(to1Half.toString())))
 				{
 					setHFromdt=from1Half;
 					setHTodt=to1Half;
+					
 				}
-				if(dt.after(from2Half) && dt.before(to2Half))
+				if((dt.after(from2Half) || dt.toString().equals(from2Half.toString())) && (dt.before(to2Half) || dt.toString().equals(to2Half.toString())))
 				{
 					setHFromdt=from2Half;
 					setHTodt=to2Half;
+					
 				}
 				
 				queryString="select count(1) from PHYSCAN  where  tran_date=? and tran_type='A'";
@@ -755,8 +763,8 @@ public class PhysicalCountSchedule implements Schedule
 						{
 							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) " +
-							"values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+									"ANALYSIS_CLASS,PRIORITY_SEQ,CYCLE_CRITERIA,EMP_CODE__USER,UNIT,TRAN_TYPE) " +
+							"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 							pstmtInsert = conn.prepareStatement(insertItemProcess);
 							pstmtInsert.setString(1,tranId);
 							pstmtInsert.setInt(2,rec);
@@ -771,6 +779,7 @@ public class PhysicalCountSchedule implements Schedule
 							pstmtInsert.setString(11,rs.getString("CYCLE_CRITERIA"));
 							pstmtInsert.setString(12,empCode);
 							pstmtInsert.setString(13,rs.getString("UNIT"));
+							pstmtInsert.setString(14,"A");
 							pstmtInsert.executeUpdate();
 							pstmtInsert.close();
 							pstmtInsert=null;
@@ -987,7 +996,7 @@ public class PhysicalCountSchedule implements Schedule
         return tranId;
      }//generateTranTd()	
 
-	/*private String generateTranId( String windowName, Connection conn )throws
+	private String generateTranId( String windowName, Connection conn )throws
 	ITMException
 	    {
 	                PreparedStatement pstmt = null;
@@ -1065,7 +1074,7 @@ public class PhysicalCountSchedule implements Schedule
 	        return tranId;
 	     }//generateTranTd()
 
-	*/
+	
 	/*
 	public String insertSchedule1() throws RemoteException,ITMException
 	{
@@ -1467,10 +1476,11 @@ private int generateDetRec(String empCode,int rec,Connection conn,String tranId,
 							aitem=arr.get(ctr).get(ctr1);
 							rec++;
 							System.out.println("lineNo---"+rec);
+							System.out.println("Setting tranType Auto ---");
 							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) " +
-							"values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+									"ANALYSIS_CLASS,PRIORITY_SEQ,CYCLE_CRITERIA,EMP_CODE__USER,UNIT,TRAN_TYPE) " +
+							"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 							pstmtInsert = conn.prepareStatement(insertItemProcess);
 							pstmtInsert.setString(1,tranId);
 							pstmtInsert.setInt(2,rec);
@@ -1485,6 +1495,7 @@ private int generateDetRec(String empCode,int rec,Connection conn,String tranId,
 							pstmtInsert.setString(11,aitem.getCycleCriteria());
 							pstmtInsert.setString(12,empCode);
 							pstmtInsert.setString(13,aitem.getUnit());
+							pstmtInsert.setString(14,"A");
 							pstmtInsert.executeUpdate();
 							pstmtInsert.close();
 							pstmtInsert=null;

webitm-wms/module-resource/sql/update.sql

@@ -29565,6 +29565,10 @@ INSERT INTO messages (
 	-- Changed by sumit on 07/02/13
 	ALTER TABLE REPL_ISS_DET ADD LOC_TO_ASSIGNED CHAR(1);
 	
+	-- Given by Manoj sharma on 09/03/13 issue tracker point 144
+	alter table physcan modify TRAN_TYPE default 'M';
+    alter table physcandet modify TRAN_TYPE default 'M';
+	
 COMMIT;