Changes done for Work order issue wise stock transfer through mobile wizard

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

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

@@ -1426,17 +1426,17 @@ 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 = ? ) and site_code  = ? and item_code= ? "
+				     " and loc_code in(select loc_code from location where inv_stat in("+invstat1+") ) and site_code  = ? and item_code= ? "
 				     + "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);
 					pstmt.setString(1,campNo);
-					pstmt.setString(2,invstat1);
-					pstmt.setString(3,siteCode);
-					pstmt.setString(4,itemCode);
-					pstmt.setString(5,lotno);
-					pstmt.setString(6,lotsl);
-					pstmt.setString(7,locCodeFr);
+					//pstmt.setString(2,invstat1);
+					pstmt.setString(2,siteCode);
+					pstmt.setString(3,itemCode);
+					pstmt.setString(4,lotno);
+					pstmt.setString(5,lotsl);
+					pstmt.setString(6,locCodeFr);
 					//pstmt.setString(8,explev);
 					rs = pstmt.executeQuery();
 					while(rs.next())

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

@@ -23,11 +23,14 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.Set;
 import java.sql.Timestamp;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+
 import javax.ejb.Stateless;
 
 @Stateless 
@@ -89,11 +92,15 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 		//  added by cpatil end 06-sept-12
 
 		String workOrder="";
+		int locCnt=0;
+		String subStoreInvStat="";
+		String mainStoreInvStat="";
 		
 		try
 		{
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;
+			MfgCommon mfgComm  = new MfgCommon();
 			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
 			if(objContext != null && objContext.trim().length()>0)
@@ -349,6 +356,55 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 								errString = getErrorString("loc_code__to","VTLOCTO2",userId);
 								break;								
 							}
+							
+							subStoreInvStat = mfgComm.getEnvMfg("999999","SUB_ST_INVSTAT", conn);
+							String subStoreArr[]=subStoreInvStat.split(",");
+							Set <String>subStorSet=new HashSet<String>();
+							for(int arrLnegth=0;arrLnegth<subStoreArr.length;arrLnegth++)
+							{
+								subStorSet.add(subStoreArr[arrLnegth]);	
+							}
+							mainStoreInvStat = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", conn);
+							
+							String mainStoreArr[]=mainStoreInvStat.split(",");
+							for(int arrLnegth=0;arrLnegth<mainStoreArr.length;arrLnegth++)
+							{
+								String mainStoreStat=	mainStoreArr[arrLnegth];
+								if(subStorSet.contains(mainStoreStat))
+								{
+									errString=getErrorString("loc_code__to","VTDISPVAR",userId);
+									break;
+								}
+									
+							}
+							/*if(subStoreInvStat.equalsIgnoreCase(mainStoreInvStat))
+							{
+								//errString = itmDBAccessEJB.getErrorString("","VTDISPVAR    ","","",conn);
+								errString=getErrorString("loc_code__to","VTDISPVAR",userId);
+								break;
+								//return errString;
+							}*/
+							sql = "select count(1) from location where loc_code  = ? and inv_stat in("+subStoreInvStat+")";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1,locCodeTo);
+							//pstmt.setString(2,subStoreInvStat);
+						    rs = pstmt.executeQuery();
+						    if(rs.next())
+						    {
+						    	locCnt = rs.getInt(1);
+						    }
+						    if(rs != null)
+						    	rs.close();
+						    rs = null;
+						    if(pstmt != null)
+						    	pstmt.close();
+						    pstmt = null;
+						    if(locCnt == 0)
+						    {
+						    	//errString = itmDBAccessEJB.getErrorString("","VTLOCCDTO1    ","","",conn);
+						    	errString=getErrorString("loc_code__to","VTLOCCDTO1",userId);
+								return errString;
+						    }
 						}
 					}
 
@@ -454,11 +510,15 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 		java.util.Date utilDate = new java.util.Date();
 		String remarks="",reasCode="",explev="",campaignNo = "",workOrderIssuId="";
 		double issQty=0.0,integralQty=0.0,potencyadj=0.0;
+		String mainStoreInvStat="";
 		try
 		{   
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
 			connDriver=null;
+			MfgCommon mfgComm=new MfgCommon();
+			mainStoreInvStat = mfgComm.getEnvMfg("999999","MAIN_ST_INVSTAT", conn);
+			//mainStoreInvStat=mainStoreInvStat.replace(",","','");
 			String applDateFormat = genericUtility.getApplDateFormat();
 
 			if(objContext != null && objContext.trim().length()>0)
@@ -579,17 +639,21 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 								" from workorder_iss wi, workorder_issdet wd " +
 								" where  wi.tran_id = wd.tran_id " +
 							//	" and  wi.work_order =  ? " +
-								" and  wi.tran_id =  ? " +
+								" and  wi.tran_id =  ? "
+								+ " and wd.loc_code in(select loc_code from location where inv_stat in("+mainStoreInvStat+")) " +
+							
 								" group by  wd.item_code, wd.lot_no, wd.lot_sl, wd.loc_code, wi.work_order  ";
 					}
 					else if( campaignNo != null &&  campaignNo.trim().length() > 0 )
 					{
 						sql = " select wd.item_code, wd.lot_no,wd.lot_sl,wd.loc_code,sum(wd.quantity + case when wd.potency_adj is null then 0 else wd.potency_adj end) as quantity" +
-								" , wi.work_order  " +
+								//" , wi.work_order  " +
 								" from workorder_iss wi, workorder_issdet wd " +
 								" where  wi.tran_id = wd.tran_id " +
 								" and  wi.work_order  IN ( SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ?  AND  STATUS = 'R'   ) " +
-								" group by wd.item_code, wd.lot_no, wd.lot_sl, wd.loc_code, wi.work_order  ";
+								" and wd.loc_code in(select loc_code from location where inv_stat in("+mainStoreInvStat+")) " +
+								" group by wd.item_code, wd.lot_no, wd.lot_sl, wd.loc_code";
+						//, wi.work_order  ";
 					}
 
 					pstmt = conn.prepareStatement(sql);
@@ -601,6 +665,7 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 					{
 						pstmt.setString(1,campaignNo);
 					}
+					//pstmt.setString(2, mainStoreInvStat);
 					System.out.println("** SQL **[" + sql + "]");
 					rs = pstmt.executeQuery();
 					while (rs.next()) 
@@ -721,7 +786,11 @@ public class  WoTrfWizIC extends ValidatorEJB implements WoTrfWizICLocal,  WoTrf
 
 						valueXmlString.append("<reas_code><![CDATA[").append(reasCode).append("]]></reas_code>\r\n");   // cpatil
 						valueXmlString.append("<remarks><![CDATA[").append(remarks).append("]]></remarks>\r\n");   // cpatil
-						valueXmlString.append("<work_order><![CDATA[").append(rs.getString("work_order")).append("]]></work_order>\r\n");   // cpatil
+						if( workOrderIssuId != null && workOrderIssuId.trim().length() >0 )
+						{
+							valueXmlString.append("<work_order><![CDATA[").append(rs.getString("work_order")).append("]]></work_order>\r\n");   // cpatil	
+						}
+						
 
 
 						valueXmlString.append("</Detail3>\r\n");

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

@@ -92,6 +92,8 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 		String worder="",remarks="",reasCode="",explev="";
 		double batchQuantity=0;
 		ITMDBAccessEJB itmDBAccessEJB = null;
+		String worderIss="",invAlloclineNo="";
+		double allocQty=0;
 		
 		try
 		{
@@ -146,7 +148,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 
 			System.out.println("@@@@@@ empCode["+empCode+"]");
 			campaignNo= checkNull(genericUtility.getColumnValueFromNode("campaign_no",dom.getElementsByTagName("Detail1").item(ctr)));
-			worder= checkNull(genericUtility.getColumnValueFromNode("work_order_iss",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());
@@ -190,6 +192,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 			}*/
 			for(ctr = 0; ctr < parentNodeListLength ; ctr++ )
 			{
+				insertFlag=false;
 				System.out.println(" parentNodeListLength  - ctr ::"+ctr);
 				//				locCodeTo= ((genericUtility.getColumnValueFromNode("loc_code__to",dom.getElementsByTagName("Detail3").item(ctr))).trim());
 				//				System.out.println("locCodeTo :: "+locCodeTo);
@@ -217,21 +220,71 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 
 				// added by cpatil on 16/06/15 start 
 
-				worder = genericUtility.getColumnValueFromNode("work_order", parentNode);
-				batchQuantity = Double.parseDouble(genericUtility.getColumnValueFromNode("batch_quantity", parentNode)==null?"0":genericUtility.getColumnValueFromNode("batch_quantity", parentNode));
+				//worder = genericUtility.getColumnValueFromNode("work_order", parentNode);
+				//batchQuantity = Double.parseDouble(genericUtility.getColumnValueFromNode("batch_quantity", parentNode)==null?"0":genericUtility.getColumnValueFromNode("batch_quantity", parentNode));
 				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)
+				{
+				//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=?");
+				pstmt.setString(1, worderIss);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					worder=rs.getString(1);
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+				//Set batchqty from workorder qty by manoj dtd 18/09/2015
+				pstmt=conn.prepareStatement("select quantity from workorder where work_order=?");
+				pstmt.setString(1, worder);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					batchQuantity=rs.getDouble(1);
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+				//Set tran_id,line_no,quantity from inv_allo_det by manoj dtd 18/09/2015
+				pstmt=conn.prepareStatement("select a.tran_id,line_no,b.quantity from inv_allocate a,inv_alloc_det b"
+						+ " where a.tran_id=b.tran_id and a.work_order=? and b.site_code=? and b.item_code=? "
+						+ " and b.lot_no=? and b.lot_sl=? and b.loc_code=? and b.exp_lev=? ");
+				pstmt.setString(1,worder);
+				pstmt.setString(2,siteCode);
+				pstmt.setString(3,itemCode);
+				pstmt.setString(4,lotNo);
+				pstmt.setString(5,lotSl);
+				pstmt.setString(6,locCode);
+				pstmt.setString(7,explev);
+				rs=pstmt.executeQuery();
+				while(rs.next())
+				{
+					tranId=rs.getString(1);
+					invAlloclineNo=rs.getString(2);
+					allocQty=rs.getDouble(3);
+					
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+			}
 
-				System.out.println("worder["+worder+"]batchQuantity["+batchQuantity+"]reasCode["+reasCode+"]explev["+explev+"]remarks["+remarks+"]");
+				System.out.println("worder["+worder+"]batchQuantity["+batchQuantity+"]reasCode["+reasCode+"]explev["+explev+"]remarks["+remarks+"]tranId["+tranId+"]invAlloclineNo["+invAlloclineNo+"]");
 				//Added by manoj sharma to add default reason code from disparm
 				reasCode = checkNull(disCommon .getDisparams("999999","DEFAULT_REAS_CODE",conn));
 				System.out.println("Default Reason Code["+reasCode+"]");
 				reasCode=reasCode.trim();
 				WoTransferPrc WoTransPrc = new WoTransferPrc();
 
-				errString = WoTransPrc.allocStockToWo("", tranId, "", siteCode, itemCode, lotNo, lotSl, quantityStr, reasCode, locCode, explev, locCodeTo,
-						worder, remarks, tranId, quantity, quantity, batchQuantity, xtraParams, conn);
+				errString = WoTransPrc.allocStockToWo(campaignNo, tranId, invAlloclineNo, siteCode, itemCode, lotNo, lotSl, quantityStr, reasCode, locCode, explev, locCodeTo,
+						worder, remarks, tranId, allocQty, quantity, batchQuantity, xtraParams, conn);
 
 				//	WoTransPrc.allocStockToWo(campNo, genratedTranId, lineno, siteCodeMfg, itemCode, lotno, lotsl, allocQty, reasCode, locCodeFr, explev, locCodeTo, 
 				//	worder, remarks, tranIdInvAlloc, actualPropQty, actualQty, batchQuantity, xtraParams, connOne)
@@ -242,20 +295,59 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 				
 				if((errString != null ) &&  (errString.indexOf("Success") > -1 || errString.indexOf("CONFSUCC") >-1))
 				{
-					conn.commit();
-					System.out.println("--process completed--commit...........");
+					//conn.commit();
+					insertFlag = true;
+					
 				//	errString = itmDBAccessEJB.getErrorString("","VPSUCC1    ","","",conn);
-					conn.close();
-					conn = null;
+					//conn.close();
+					//conn = null;
 				}
 				
 				else 
 				{
-					conn.rollback();
-					System.out.println("--process not completed--rollback.........");
+					insertFlag=false;
+					//conn.rollback();
+					
 				//	errString = itmDBAccessEJB.getErrorString("","VTPRCERR ","","",conn);
-					conn.close();
-					conn = null;
+					//conn.close();
+					//conn = null;
+				}
+				if(insertFlag)
+				{
+					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=?"
+							+ "UNION ALL SELECT '"+worder+"' FROM DUAL) "
+							+ ") AND ITEM_CODE=? AND LOT_NO=? AND LOT_SL=? AND LOC_CODE=? AND EXP_LEV=? ";
+					
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,locCodeTo);
+					pstmt.setString(2,campaignNo);
+					pstmt.setString(3,itemCode);
+					pstmt.setString(4,lotNo);
+					pstmt.setString(5,lotSl);
+					pstmt.setString(6,locCode);
+					pstmt.setString(7,explev);
+					int count = pstmt.executeUpdate();
+					pstmt.close();
+					pstmt=null;
+					if(count>0)
+					{
+						conn.commit();
+						System.out.println("--process completed--commit...........");
+						//conn.close();
+						//conn = null;
+						
+					}
+					else
+					{
+						conn.rollback();
+						System.out.println("--process not completed--rollback.........");
+						//conn.close();
+						//conn = null;
+					}
+						
+					
 				}
 
 				// cpatil end
@@ -312,7 +404,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 			}
 
 			//System.out.println(" detailData final tree ::"+list.size()+"::"+list);
-			if(insertFlag)
+			/*if(insertFlag)
 			{
 				//conn.commit(); // 04/02/15 manoharan commented and new method with connection of stock transfer confirm called
 				System.out.println(" connection committed @@@@@@");
@@ -534,7 +626,7 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 			}else
 			{
 				//	conn.rollback();System.out.println(" connection rollback @@@@@@");
-			}
+			}*/
 
 			//  04/02/15 manoharan commit taken from finally
 			/*if(!isError)
@@ -574,6 +666,8 @@ public class WoTrfWizPos extends ValidatorEJB implements WoTrfWizPosLocal, WoTrf
 					pstmt.close();
 					pstmt = null;
 				}
+				conn.close();
+				conn=null;
 				/*if(errString.indexOf("CONFSUCC") > -1)
 				{
 					conn.commit();