changed by sankara on 20/09/13 merged srd metadata source from manoj sharma

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

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

@@ -69,6 +69,7 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal,
 		Node parentNode = null;
 		String unit="";
 		int rec=0;
+		String tranType="";
 
 		try
 		{
@@ -136,6 +137,7 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal,
 					lotSl=rs.getString("LOT_SL");
 					quantityInput = rs.getDouble("PHY_INPUT");
 					unit=rs.getString("UNIT");
+					tranType=rs.getString("TRAN_TYPE");
 					if(unit == null || unit.trim().length() == 0)
 						{
 							sql1 ="select unit from item  where item_code = ? ";
@@ -162,20 +164,23 @@ public class PhyItemScanPos extends ValidatorEJB implements PhyItemScanPosLocal,
 					pstmt1.close();
 					pstmt1=null;
 
-					sql="update STOCK SET LAST_PHYC_DATE=? WHERE item_code=? and" +
-							" site_code=? and lot_no=? and loc_code=? and lot_sl=?  " ;
-
-					pstmt1=conn.prepareStatement(sql);
-					pstmt1.setTimestamp(1,currDateNew);
-					pstmt1.setString(2,itemCode);
-					pstmt1.setString(3,siteCode);
-					pstmt1.setString(4,lotNo);
-					pstmt1.setString(5,locCode);
-					pstmt1.setString(6,lotSl);
-
-					pstmt1.executeUpdate();
-					pstmt1.close();
-					pstmt1=null;
+					if(tranType != null && !"E".equalsIgnoreCase(tranType))
+					{
+						sql="update STOCK SET LAST_PHYC_DATE=? WHERE item_code=? and" +
+								" site_code=? and lot_no=? and loc_code=? and lot_sl=?  " ;
+	
+						pstmt1=conn.prepareStatement(sql);
+						pstmt1.setTimestamp(1,currDateNew);
+						pstmt1.setString(2,itemCode);
+						pstmt1.setString(3,siteCode);
+						pstmt1.setString(4,lotNo);
+						pstmt1.setString(5,locCode);
+						pstmt1.setString(6,lotSl);
+	
+						pstmt1.executeUpdate();
+						pstmt1.close();
+						pstmt1=null;
+					}
 					
 					if(invStat == null || invStat.trim().length() == 0)
 					{

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

@@ -360,6 +360,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
 		String phyHanUOM = "";
 		java.util.Date utilDate = new java.util.Date();
 		String isStock="";
+		String tranType="";
 
 		try
 		{   
@@ -506,7 +507,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
 		
 					sSQL = "SELECT H.TRAN_ID,S.STATUS , S.LINE_NO, S.ITEM_CODE,S.SITE_CODE,S.LOC_CODE,S.LOT_NO,S.LOT_SL, S.QUANTITY,S.UNIT,M.DESCR AS ITEM_DESCR, "
 						+ " L.DESCR AS LOC_DESCR, L.PHY_HAN_BASIS, L.PHY_HAN_UOM , S.CYCLE_CRITERIA, S.ANALYSIS_CLASS , S.PHY_INPUT, S.PRIORITY_SEQ"
-						+ " ,CASE WHEN S.PHY_INPUT IS NULL THEN 0 ELSE S.PHY_INPUT END PHY_INPUT "
+						+ " ,CASE WHEN S.PHY_INPUT IS NULL THEN 0 ELSE S.PHY_INPUT END PHY_INPUT,S.TRAN_TYPE "
 						+ " FROM PHYSCANDET S,ITEM M,LOCATION L,PHYSCAN H "
 						+ " WHERE H.TRAN_ID=S.TRAN_ID AND  S.ITEM_CODE = M.ITEM_CODE AND S.LOC_CODE = L.LOC_CODE "
 						+ " AND H.tran_date <= ? AND " +
@@ -536,7 +537,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
 						cycleCriteria = rs.getString("CYCLE_CRITERIA");
 						analysisClass = rs.getString("ANALYSIS_CLASS");
 						System.out.println("phyHanBasis - >[" + phyHanBasis	+ "] phyHanUOM [" + phyHanUOM + "]");
-
+						tranType= rs.getString("TRAN_TYPE");
 						phyHanBasisDesc = "";
 						if (phyHanBasis != null ) 
 						{
@@ -590,6 +591,7 @@ public class PhyItemVerifyIC extends ValidatorEJB implements PhyItemVerifyICLoca
 						}*/
 						valueXmlString.append("<status><![CDATA[").append("Y").append("]]></status>\r\n");
 						valueXmlString.append("<reverify><![CDATA[").append("N").append("]]></reverify>\r\n");
+						valueXmlString.append( "<tran_type><![CDATA[" ).append(tranType).append( "]]></tran_type>\r\n" );
 						valueXmlString.append("</Detail2>\r\n");
 					}
 					rs.close();

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

@@ -39,6 +39,7 @@ public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLo
 		String refId="";
 		int refLineNo=0;
 		int rec=0;
+		String tranType="";
         try
 		{
 			conn.setAutoCommit(false);
@@ -85,6 +86,7 @@ public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLo
 					lotSl = rs2.getString("lot_sl");
 					refId=rs2.getString("ref_id");
 					refLineNo=rs2.getInt("ref_line_no");
+					tranType=rs2.getString("tran_type");
 					System.out.println("ITEM CODE["+itemCode+"] SITE CODE["+siteCode+"] LOC CODE["+locCode+"] LOT_NO["+lotNo+"] LOT SL["+lotSl+"]");
 					
 					sql ="select inv_stat from location  where loc_code = ? ";
@@ -101,17 +103,20 @@ public class PhyItemVerifyPos extends ValidatorEJB implements PhyItemVerifyPosLo
 					System.out.println("invStat"+invStat+"   quantityInput="+quantityInput);
 	
 					
-					sSQL = "UPDATE STOCK SET LAST_PHYC_DATE = ? WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
-					pstmt1 = conn.prepareStatement(sSQL);
-					pstmt1.setTimestamp(1, date1);
-					pstmt1.setString(2, itemCode);
-					pstmt1.setString(3, siteCode);
-					pstmt1.setString(4, locCode);
-					pstmt1.setString(5, lotNo);
-					pstmt1.setString(6, lotSl);				
-					pstmt1.executeUpdate();	
-					pstmt1.close();
-					pstmt1 = null; 
+					if(tranType!=null &&  !"E".equalsIgnoreCase(tranType))
+					{
+						sSQL = "UPDATE STOCK SET LAST_PHYC_DATE = ? WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ?";
+						pstmt1 = conn.prepareStatement(sSQL);
+						pstmt1.setTimestamp(1, date1);
+						pstmt1.setString(2, itemCode);
+						pstmt1.setString(3, siteCode);
+						pstmt1.setString(4, locCode);
+						pstmt1.setString(5, lotNo);
+						pstmt1.setString(6, lotSl);				
+						pstmt1.executeUpdate();	
+						pstmt1.close();
+						pstmt1 = null; 
+					}
 					
 					sSQL = "UPDATE PHYSCANDET SET STATUS=?,VERIFIED = ? WHERE TRAN_ID = ? AND LINE_NO = ? ";
 					pstmt1 = conn.prepareStatement(sSQL);

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

@@ -422,7 +422,7 @@ public class PhysicalCountSchedule implements Schedule
 					queryString=" SELECT DISTINCT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE,CYCLE_CRITERIA,S.QUANTITY,S.UNIT FROM ITEM I, STOCK S,LOCATION L" +
 							//",INVTRACE T" +
 							",ITEM_LOT_PACKSIZE P WHERE ANALYSIS_CLASS='A' " +
-							" AND S.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 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 B.TRAN_TYPE<>'E') " +
 							" 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 P.ITEM_CODE=T.ITEM_CODE " +
@@ -478,7 +478,7 @@ public class PhysicalCountSchedule implements Schedule
 							//",INVTRACE T" +
 							",ITEM_LOT_PACKSIZE P WHERE ANALYSIS_CLASS='B' " +
 							" AND S.ITEM_CODE = I.ITEM_CODE AND S.LOC_CODE=L.LOC_CODE AND CYCLE_COUNT_REQD='Y' " +
-							" AND S.ITEM_CODE NOT IN (SELECT ITEM_CODE FROM PHYSCAN A,PHYSCANDET B WHERE A.TRAN_ID=B.TRAN_ID AND  ANALYSIS_CLASS='B' AND TRAN_DATE BETWEEN ? AND ?  AND CASE WHEN B.STATUS IS NULL THEN 'N' ELSE B.STATUS END ='Y'  and A.tran_type='A' ) " +
+							" AND S.ITEM_CODE NOT IN (SELECT ITEM_CODE FROM PHYSCAN A,PHYSCANDET B WHERE A.TRAN_ID=B.TRAN_ID AND  ANALYSIS_CLASS='B' AND TRAN_DATE BETWEEN ? AND ?  AND CASE WHEN B.STATUS IS NULL THEN 'N' ELSE B.STATUS END ='Y'  and A.tran_type='A' AND B.TRAN_TYPE<>'E' ) " +
 							" AND S.ITEM_CODE=P.ITEM_CODE" +
 							//" AND P.ITEM_CODE=T.ITEM_CODE" +
 							" AND S.LOT_NO BETWEEN P.LOT_NO__FROM AND P.LOT_NO__TO "+
@@ -533,7 +533,7 @@ public class PhysicalCountSchedule implements Schedule
 								//",INVTRACE T" +
 								",ITEM_LOT_PACKSIZE P WHERE ANALYSIS_CLASS='C' " +
 								" AND S.ITEM_CODE = I.ITEM_CODE AND S.LOC_CODE=L.LOC_CODE AND CYCLE_COUNT_REQD='Y'" +
-								" AND S.ITEM_CODE NOT IN (SELECT ITEM_CODE FROM PHYSCAN A,PHYSCANDET B WHERE A.TRAN_ID=B.TRAN_ID AND ANALYSIS_CLASS='C' AND  TRAN_DATE BETWEEN ? AND ?  AND CASE WHEN B.STATUS IS NULL THEN 'N' ELSE B.STATUS END ='Y'  and A.tran_type='A' )" +
+								" AND S.ITEM_CODE NOT IN (SELECT ITEM_CODE FROM PHYSCAN A,PHYSCANDET B WHERE A.TRAN_ID=B.TRAN_ID AND ANALYSIS_CLASS='C' AND  TRAN_DATE BETWEEN ? AND ?  AND CASE WHEN B.STATUS IS NULL THEN 'N' ELSE B.STATUS END ='Y'  and A.tran_type='A' AND B.TRAN_TYPE<>'E' )" +
 								" AND S.ITEM_CODE=P.ITEM_CODE" +
 								//" AND P.ITEM_CODE=T.ITEM_CODE" +
 								" AND S.LOT_NO BETWEEN P.LOT_NO__FROM AND P.LOT_NO__TO "+
@@ -797,7 +797,8 @@ public class PhysicalCountSchedule implements Schedule
 								pstmtInsert.setString(11,rs1.getString("CYCLE_CRITERIA"));
 								pstmtInsert.setString(12,empCode);
 								pstmtInsert.setString(13,rs1.getString("UNIT"));
-								pstmtInsert.setString(14,"A");
+								//pstmtInsert.setString(14,"A");Commented by Manoj dtd 13/09/2013 to mark record as E if Previous Day Empty
+								pstmtInsert.setString(14,"E");
 								pstmtInsert.executeUpdate();
 								pstmtInsert.close();
 								pstmtInsert=null;
@@ -830,7 +831,8 @@ 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.setString(14,"A");//Commented by Manoj dtd 13/09/2013 to mark record as E if Previous Day Empty
+								pstmtInsert.setString(14,"E");
 								pstmtInsert.executeUpdate();
 								pstmtInsert.close();
 								pstmtInsert=null;