modify code for wo stock transfer for same side code, remove form 2

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

webitm-mfg/ibase/webitm/ejb/mfg/WoTransferPrc.java

@@ -1174,9 +1174,25 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 		MfgCommon mfgComm  = new MfgCommon();
 		double qtyPerArtFr=0;
 		double noArt=0;
+		String invstat1Str="";
+		
 		try   
 		{
 			invstat1 = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", connOne); 
+			
+			System.out.println("@@@@@@ invstat1["+invstat1+"]");
+			String invstat1Arr[]=invstat1.split(",");
+			for(int arrLnegth=0;arrLnegth<invstat1Arr.length;arrLnegth++)
+			{
+				invstat1Str = invstat1Str + "'" + invstat1Arr[arrLnegth] + "',";
+			}
+
+			if( invstat1Str != null && invstat1Str.trim().length() > 0 )
+			{
+				invstat1Str = invstat1Str.substring(0, invstat1Str.length()-1);
+			}
+			System.out.println("@@@@@ invstat1Str["+invstat1Str+"]");
+			
 			System.out.println("@@@@@@@ wostock trans.  function called::");
 			xmlBuff = new StringBuffer();
 			genericUtility = GenericUtility.getInstance();
@@ -1426,7 +1442,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 					sql = "select tran_id,line_no,item_code,lot_no,lot_sl,loc_code, quantity,exp_lev "+
 				     " from inv_alloc_det  where  tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE "+
 				     " WHERE WORK_ORDER  IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "+
-				     " and loc_code in(select loc_code from location where inv_stat in("+invstat1+") ) and site_code  = ? and item_code= ? "
+				     " and loc_code in(select loc_code from location where inv_stat in("+invstat1Str+") ) and site_code  = ? and item_code= ? "  // change invstat1 to invstat1Str for multiple loc code on 22/09/15 by cpatil
 				     + "and case when deallocated is null then 'N' else deallocated end = 'N' and lot_no=? and lot_sl=? and loc_code=? ";
 			
 					pstmt = connOne.prepareStatement(sql);

webitm-mfg/ibase/webitm/ejb/mfg/WoTrfWizPos.java

@@ -122,7 +122,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 
 			dom = genericUtility.parseString(domString); 
 			siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
-			parentNodeList = dom.getElementsByTagName("Detail3");
+			parentNodeList = dom.getElementsByTagName("Detail2"); // changes detail3 to detail2 as second screen remove and field set in screen 1 by cpatil on 22/09/15
 			parentNodeListLength = parentNodeList.getLength();
 			// added on 25/MAR/14 BY RITESH START
 			loginCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
@@ -149,12 +149,12 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 			System.out.println("@@@@@@ empCode["+empCode+"]");
 			campaignNo= checkNull(genericUtility.getColumnValueFromNode("campaign_no",dom.getElementsByTagName("Detail1").item(ctr)));
 			worderIss= checkNull(genericUtility.getColumnValueFromNode("work_order_iss",dom.getElementsByTagName("Detail1").item(ctr)));
-			siteCodeDom= ((genericUtility.getColumnValueFromNode("site_code",dom.getElementsByTagName("Detail2").item(ctr))).trim());
-			itemSer= ((genericUtility.getColumnValueFromNode("item_ser",dom.getElementsByTagName("Detail2").item(ctr))).trim());
-			tranDate= ((genericUtility.getColumnValueFromNode("tran_date",dom.getElementsByTagName("Detail2").item(ctr))).trim());
-			refSerFor= ((genericUtility.getColumnValueFromNode("ref_ser__for",dom.getElementsByTagName("Detail2").item(ctr))).trim());
+			siteCodeDom= ((genericUtility.getColumnValueFromNode("site_code",dom.getElementsByTagName("Detail1").item(ctr))).trim()); // changes detail2 to detail1 as second screen remove and field set in screen 1 by cpatil on 22/09/15
+			//itemSer= ((genericUtility.getColumnValueFromNode("item_ser",dom.getElementsByTagName("Detail2").item(ctr))).trim());  // commented  as second screen remove   by cpatil on 22/09/15
+			tranDate= ((genericUtility.getColumnValueFromNode("tran_date",dom.getElementsByTagName("Detail1").item(ctr))).trim()); // changes detail2 to detail1 as second screen remove and field set in screen 1   by cpatil on 22/09/15
+			//refSerFor= ((genericUtility.getColumnValueFromNode("ref_ser__for",dom.getElementsByTagName("Detail2").item(ctr))).trim());    // commented  as second screen remove   by cpatil on 22/09/15 
 
-			System.out.println("campaignNo["+campaignNo+"]worder["+worder+"]siteCodeDom["+siteCodeDom+"]itemSer["+itemSer+"]tranDate["+tranDate+"] refSerFor["+refSerFor+"] locCodeTo["+locCodeTo+"]");
+			System.out.println("campaignNo["+campaignNo+"]worderIss["+worderIss+"]worder["+worder+"]siteCodeDom["+siteCodeDom+"]itemSer["+itemSer+"]tranDate["+tranDate+"] refSerFor["+refSerFor+"] locCodeTo["+locCodeTo+"]");
 			//genratedTranId = generateTranId( "w_stock_transfer",siteCode, conn );
 			/*sql = "INSERT INTO STOCK_TRANSFER(SITE_CODE,ITEM_SER,REF_SER__FOR,TRAN_DATE,TRAN_ID,CONFIRMED) VALUES(?,?,?,?,?,?)";
 			pstmt = conn.prepareStatement( sql );
@@ -225,7 +225,8 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 				reasCode = genericUtility.getColumnValueFromNode("reas_code", parentNode);
 				explev = genericUtility.getColumnValueFromNode("exp_lev", parentNode);
 				remarks = genericUtility.getColumnValueFromNode("remarks", parentNode);
-				if(campaignNo!=null && "null".equalsIgnoreCase(campaignNo) && campaignNo.trim().length()>0)
+				
+				if(worderIss!=null && (!"null".equalsIgnoreCase(worderIss)) && worderIss.trim().length()>0)
 				{
 				//Set work_order from workorder_iss qty by manoj dtd 18/09/2015
 				pstmt=conn.prepareStatement("select work_order from workorder_iss where tran_id=?");
@@ -314,9 +315,9 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 				}
 				if(insertFlag)
 				{
-					sql="UPDATE WORKORDER_ISSDET  SET LOC_CODE=? WHERE "
+					sql=" UPDATE WORKORDER_ISSDET  SET LOC_CODE=? WHERE "
 							+ "TRAN_ID IN(SELECT TRAN_ID FROM WORKORDER_ISS WHERE "
-							+ "WORK_ORDER IN(SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO=?"
+							+ " WORK_ORDER IN(SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO=? "
 							+ "UNION ALL SELECT '"+worder+"' FROM DUAL) "
 							+ ") AND ITEM_CODE=? AND LOT_NO=? AND LOT_SL=? AND LOC_CODE=? AND EXP_LEV=? ";