Ejb added for GRN Transfer Transaction[D14HFRA001]

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

webitm-dis/ibase/webitm/ejb/dis/GRNTransfWizIC.java

@@ -131,7 +131,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 
 						if (grnNo != null && grnNo.trim().length() > 0)
 						{
-							sql = " select count(1) cnt from porcpdet where tran_id = ? ";
+							sql = " select count(1) cnt from porcp where tran_id = ?  and (case when confirmed is null then 'N' else confirmed end = 'Y') ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, grnNo);
 							rs = pstmt.executeQuery();
@@ -142,7 +142,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 							}
 							rs.close();
 							rs = null;
-
+							System.out.println("cnt:::["+cnt+"]");
 							pstmt.close();
 							pstmt = null;
 							if (cnt == 0)
@@ -199,13 +199,6 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 						System.out.println("siteCode:"+siteCode);
 						if (loginSiteCode != null && loginSiteCode.trim().length() > 0)
 						{
-							if(!(siteCode.equalsIgnoreCase(loginSiteCode)))
-							{
-							errCode = "VTINVLOGN";
-							errList.add(errCode);
-							errFields.add(childNodeName.toLowerCase());
-							}
-							
 							sql = " SELECT COUNT(1) cnt FROM site WHERE site_code = ? ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, loginSiteCode);
@@ -226,44 +219,19 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
-						} else
+							if(!(siteCode.equalsIgnoreCase(loginSiteCode)))
 							{
-							errCode = "VMSITEBLK";
+							errCode = "VTINVLOGN";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 							}
-					} else if ("ref_ser__for".equalsIgnoreCase(childNodeName))
-					{
-						refSer = genericUtility.getColumnValue("ref_ser__for", dom);
-						System.out.println("refSer[" + refSer + "]");
-						if (refSer != null && refSer.trim().length() > 0)
-						{
-							sql = "SELECT COUNT(*) AS COUNT FROM REFSER WHERE REF_SER = ?";
-							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, refSer);
-							rs = pstmt.executeQuery();
-							if (rs.next())
-							{
-								cnt1 = rs.getInt("COUNT");
-							}
-							rs.close();
-							rs = null;
-							pstmt.close();
-							pstmt = null;
-
-							if (cnt1 == 0)
-							{
-								errList.add("VTREFSER1");
-								errFields.add(childNodeName.toLowerCase());
-							}
 						} else
 						{
-							errCode = "NULLREFSER";
+							errCode = "VMSITEBLK";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
 					}
-
 				}
 			}// case2 end
 				break;
@@ -561,6 +529,7 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 				if (currentColumn.trim().equalsIgnoreCase("site_code"))
 				{
 					siteCode = genericUtility.getColumnValue("site_code", dom);
+					System.out.println("::siteCode @@::" + siteCode);
 					sql = "SELECT DESCR FROM SITE WHERE SITE_CODE = ?";
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, siteCode );						
@@ -625,13 +594,15 @@ public class GRNTransfWizIC extends ValidatorEJB implements GRNTransfWizICLocal,
 								+" WHERE ( stock.inv_stat = invstat.inv_stat ) and  "
 								+" ( stock.item_code = ? ) AND  "
 								+" ( stock.site_code = ?) AND  "
-								+" ( stock.inv_stat = 'GRL') AND  "
+								//+" ( stock.inv_stat = 'GRL') AND  "
+								+" ( stock.loc_code = ?) AND  "
 								+" ( stock.lot_no = ?) AND  "
 								+" ( stock.quantity  - case when stock.alloc_qty is null then 0 else stock.alloc_qty end >  0 )";
 						pstmt1 = conn.prepareStatement(sql1);
 						pstmt1.setString(1, itemCode);
 						pstmt1.setString(2, siteCode);
-						pstmt1.setString(3, lotNo);
+						pstmt1.setString(3, locCode);
+						pstmt1.setString(4, lotNo);
 						rs1 = pstmt1.executeQuery();
 						while (rs1.next())
 						{

webitm-dis/ibase/webitm/ejb/dis/GRNTransfWizPos.java

@@ -43,67 +43,68 @@ public class GRNTransfWizPos extends ValidatorEJB implements GRNTransfWizPosLoca
 		String sql = "";
 		String updateSql="";
 		String locCode = "",itemCode = "",lotNo="",siteCode="",lotSl="";
-		int totStockTranDet = 0,updCnt=0;
-		String lotNoFrom="",lotSlFrom="",locCodeTo="",locCodeFrom="";
+		int updCnt=0;
+		String lotNoFrom="",lotSlFrom="",locCodeTo="",locCodeFrom="",sql1="";
 
 		boolean toCommit = false;
 		PreparedStatement pstmt = null;
+		PreparedStatement pstmt1 = null;
         ResultSet rs = null;
+        ResultSet rs1 = null;
         StockTransferConf stockTranConf = new StockTransferConf();
 
 		try
 		{
 			conn.setAutoCommit(false);
-			System.out.println( "Total Tran Id ["+tranId+"]");
-
-			sql = "SELECT COUNT(*) AS COUNT FROM STOCK_TRANSFER_DET WHERE TRAN_ID = ?";
-			pstmt = conn.prepareStatement(sql);
-			pstmt.setString( 1, tranId );
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				totStockTranDet = rs.getInt("COUNT");
-			}
-			rs.close(); rs = null;
-			pstmt.close(); pstmt = null;
-
-			System.out.println("Total Transfer detail-->["+totStockTranDet+"]");
-			//checking data available in stock_transfer_det table
-			if( totStockTranDet > 0 )
-			{
+			System.out.println("Tran Id [" + tranId + "]");
 			System.out.println("Calling Confirm method...............");
-				errString = stockTranConf.confirm( tranId, xtraParams, forcedFlag, conn, toCommit);
+			errString = stockTranConf.confirm(tranId, xtraParams, forcedFlag, conn, toCommit);
 			System.out.println("transfer done::");
-				System.out.println("errString:@@@@:["+errString+"]");
-				 if(errString== null || errString.trim().length() == 0)
+			System.out.println("errString:@@@@:[" + errString + "]");
+			if (errString == null || errString.trim().length() == 0)
 			{
 				sql = "select item_code,lot_no__fr,lot_sl__fr,loc_code__fr,loc_code__to from stock_transfer_det where tran_id = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
 				rs = pstmt.executeQuery();
-					if (rs.next())
+				while (rs.next())
 				{
 					itemCode = rs.getString("item_code");
 					lotNoFrom = rs.getString("lot_no__fr");
 					lotSlFrom = rs.getString("lot_sl__fr");
 					locCodeTo = rs.getString("loc_code__to");
 					locCodeFrom = rs.getString("loc_code__fr");
-					}
-					rs.close();
-					rs = null;
-					pstmt.close();
-					pstmt = null;
 					
+					sql1 = "select loc_code from qc_order where item_code = ? and lot_no = ?";
+					pstmt1 = conn.prepareStatement(sql1);
+					pstmt1.setString(1, itemCode);
+					pstmt1.setString(2, lotNoFrom);
+					rs1 = pstmt1.executeQuery();
+					if (rs1.next())
+					{
+						locCode = rs1.getString("loc_code");
+					}
+					rs1.close();
+					rs1 = null;
+					pstmt1.close();
+					pstmt1 = null;
+					System.out.println("locCode:["+locCode+"]");
+					if(locCode != null)
+					{
 						updateSql = "update qc_order set loc_code = null " + "where item_code = ? and lot_no = ? ";
-					pstmt = conn.prepareStatement(updateSql);
-					pstmt.setString(1, itemCode);
-					pstmt.setString(2, lotNoFrom);
-					updCnt = pstmt.executeUpdate();
+						pstmt1 = conn.prepareStatement(updateSql);
+						pstmt1.setString(1, itemCode);
+						pstmt1.setString(2, lotNoFrom);
+						updCnt = pstmt1.executeUpdate();
 						System.out.println("updCnt::[" + updCnt + "]");
+						pstmt1.close();
+						pstmt1 = null;
+					}
+				}
+				rs.close();
+				rs = null;
 				pstmt.close();
 				pstmt = null;
-
-				}
 			}
 		}
 		catch(Exception e)

webitm-dis/ibase/webitm/ejb/dis/StockTransferPos.java

@@ -50,8 +50,17 @@ public class StockTransferPos extends ValidatorEJB implements StockTransferPosLo
 			if (xmlString1 != null && xmlString1.trim().length() > 0)
 			{
 				dom = GenericUtility.getInstance().parseString(xmlString1);
+				if( (xmlString1.toUpperCase()).contains("DETAIL4"))
+				{
+					System.out.println(">>>>>>>>>>>>>>In POS Detail4:"+xmlString1);
 					executepostSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
 				}
+				else
+				{
+					executepostSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
+				}
+				//executepostSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
+			}			
 		}
 		catch(Exception e)
 		{
@@ -88,7 +97,7 @@ public class StockTransferPos extends ValidatorEJB implements StockTransferPosLo
 			parentNode = hdrDom.item(0);
 			String objName = getObjName(parentNode);
 			System.out.println("objName=["+objName+"]domID["+domID+"]");
-			if(("w_qc_sample_wiz".equals(objName)) || ("w_grn_transfer_wiz".equals(objName)) )
+			if(("w_qc_sample_wiz".equalsIgnoreCase(objName)) || ("w_grn_transfer_wiz".equalsIgnoreCase(objName)) )
 			{
 				hdrDom = dom.getElementsByTagName("Detail2");
 			}

webitm-dis/ibase/webitm/ejb/dis/StockTransferPrs.java

@@ -52,7 +52,7 @@ public class StockTransferPrs extends ValidatorEJB implements StockTransferPrsLo
 				dom = GenericUtility.getInstance().parseString(xmlString1);
 				if( (xmlString1.toUpperCase()).contains("DETAIL4"))
 				{
-					System.out.println(">>>>>>>>>>>>>>In Detail4:"+xmlString1);
+					System.out.println(">>>>>>>>>>>>>>In PRS Detail4:"+xmlString1);
 					//executePostSaveRec(dom,domId,objContext,editFlag,xtraParams, conn);
 					executepreSaveRec(dom,domId,objContext,editFlag,xtraParams,conn);
 				}
@@ -98,7 +98,7 @@ public class StockTransferPrs extends ValidatorEJB implements StockTransferPrsLo
 			parentNode = hdrDom.item(0);
 			String objName = getObjName(parentNode);
 			System.out.println(">>>>>>>>>>>objName Detail2:"+objName);
-			if(("w_qc_sample_wiz".equals(objName)) || ("w_grn_transfer_wiz".equals(objName)) )
+			if(("w_qc_sample_wiz".equalsIgnoreCase(objName)) || ("w_grn_transfer_wiz".equalsIgnoreCase(objName)) )
 			{
 				System.out.println(">>>>>In Match obj name Detail2:"+objName);
 				hdrDom = dom.getElementsByTagName("Detail2");