Skip to content

B
business-java
Commit 1b40b690 authored by mjadhav's avatar mjadhav
Browse files
Options

changes done by mahendra(tranId,line_no,line_no_sl-changed column pos) 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94985 ce508802-f39f-4f6c-b175-0d175dae99d5
parent eeca80de
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 20 deletions
webitm-dis/ibase/webitm/ejb/dis/InvHoldRelGen.java
View file @ 1b40b690
...@@ -12,6 +12,9 @@ import ibase.webitm.utility.*; ...@@ -12,6 +12,9 @@ import ibase.webitm.utility.*;
import ibase.system.config.*; import ibase.system.config.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.HashSet;
import java.util.Iterator;
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
import ibase.webitm.ejb.dis.adv.*; import ibase.webitm.ejb.dis.adv.*;
...@@ -99,7 +102,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -99,7 +102,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
String sql=""; String sql="";
String lockCodeFrom = "",lockCodeTo = "",tranIdFrom = "",tranIdTo="",refIdFrom="",refIdTo="",autoConfirmed="",schRelDateFromstr="",schRelDateTostr=""; String lockCodeFrom = "",lockCodeTo = "",tranIdFrom = "",tranIdTo="",refIdFrom="",refIdTo="",autoConfirmed="",schRelDateFromstr="",schRelDateTostr="";
Timestamp schRelDateFrom=null,schRelDateTo=null; Timestamp schRelDateFrom=null,schRelDateTo=null;
String lotNoFrom="",lotNoTo="";
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
...@@ -128,6 +131,8 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -128,6 +131,8 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
lockCodeFrom = genericUtility.getColumnValue("lock_code__from",headerDom); //added by Ritesh on 08/05/13 lockCodeFrom = genericUtility.getColumnValue("lock_code__from",headerDom); //added by Ritesh on 08/05/13
lockCodeTo = genericUtility.getColumnValue("lock_code__to",headerDom); //added by Ritesh on 08/05/13 lockCodeTo = genericUtility.getColumnValue("lock_code__to",headerDom); //added by Ritesh on 08/05/13
autoConfirmed = genericUtility.getColumnValue("auto_confirmed",headerDom); autoConfirmed = genericUtility.getColumnValue("auto_confirmed",headerDom);
lotNoFrom = genericUtility.getColumnValue("lot_no__from",headerDom);//Added by manoj dtd 15/04/2014 to getdata based on entered lotNo
lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);//Added by manoj dtd 15/04/2014 to getdata based on entered lotNo
...@@ -152,14 +157,18 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -152,14 +157,18 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
System.out.println("autoConfirmed =>"+autoConfirmed); System.out.println("autoConfirmed =>"+autoConfirmed);
System.out.println("lockCodeFrom=>"+lockCodeFrom); //added by Ritesh on 08/05/13 System.out.println("lockCodeFrom=>"+lockCodeFrom); //added by Ritesh on 08/05/13
System.out.println("lockCodeTo=>"+lockCodeTo); //added by Ritesh on 08/05/13 System.out.println("lockCodeTo=>"+lockCodeTo); //added by Ritesh on 08/05/13
if ( tranIdFrom == null || tranIdFrom.trim().length() == 0 )
System.out.println("lotNoFrom=>"+lotNoFrom);
System.out.println("lotNoTo=>"+lotNoTo);
/*if ( tranIdFrom == null || tranIdFrom.trim().length() == 0 )
{ {
System.out.println("tran id from is Null..."); System.out.println("tran id from is Null...");
errString = itmDBAccessEJB.getErrorString("","VMTRIDFRNU","","",conn); errString = itmDBAccessEJB.getErrorString("","VMTRIDFRNU","","",conn);
return errString; return errString;
} }
else else
{ {*/
/* /*
sql = "select count(1) from inv_hold_det where tran_id ='" + tranIdFrom + "'"; sql = "select count(1) from inv_hold_det where tran_id ='" + tranIdFrom + "'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -178,16 +187,16 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -178,16 +187,16 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
*/ */
} //}
if ( tranIdTo == null || tranIdTo.trim().length() == 0 ) /*if ( tranIdTo == null || tranIdTo.trim().length() == 0 )
{ {
System.out.println("tran id to is Null..."); System.out.println("tran id to is Null...");
errString = itmDBAccessEJB.getErrorString("","VMTRIDTONU","","",conn); errString = itmDBAccessEJB.getErrorString("","VMTRIDTONU","","",conn);
return errString; return errString;
} }
else else
{ {*/
/* /*
sql = "select count(1) from inv_hold_det where tran_id ='" + tranIdTo + "'"; sql = "select count(1) from inv_hold_det where tran_id ='" + tranIdTo + "'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -206,9 +215,9 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -206,9 +215,9 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
*/ */
} //}
if ( schRelDateFrom == null ) /*if ( schRelDateFrom == null )
{ {
System.out.println("schedule release date from is Null..."); System.out.println("schedule release date from is Null...");
errString = itmDBAccessEJB.getErrorString("","VMSCDTFRNU","","",conn); errString = itmDBAccessEJB.getErrorString("","VMSCDTFRNU","","",conn);
...@@ -225,9 +234,9 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -225,9 +234,9 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
} }
} }
} }
*/
/*if ( schRelDateTo == null )
if ( schRelDateTo == null )
{ {
System.out.println("schedule release date to is Null..."); System.out.println("schedule release date to is Null...");
errString = itmDBAccessEJB.getErrorString("","VMSCDTTONU","","",conn); errString = itmDBAccessEJB.getErrorString("","VMSCDTTONU","","",conn);
...@@ -243,10 +252,10 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -243,10 +252,10 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
} }
} }*/
if ( refIdFrom == null ) /*if ( refIdFrom == null )
{ {
//refIdFrom="0"; //refIdFrom="0";
//System.out.println("ref id from is Null..."); //System.out.println("ref id from is Null...");
...@@ -254,7 +263,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -254,7 +263,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
//return errString; //return errString;
} }
else else
{ {*/
/* /*
sql = "select count(1) from inv_hold where ref_id ='" + refIdFrom + "'"; sql = "select count(1) from inv_hold where ref_id ='" + refIdFrom + "'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -273,10 +282,10 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -273,10 +282,10 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
*/ */
} //}
if ( refIdTo == null ) /*if ( refIdTo == null )
{ {
//refIdTo="ZZ"; //refIdTo="ZZ";
//System.out.println("ref id to is Null..."); //System.out.println("ref id to is Null...");
...@@ -284,7 +293,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -284,7 +293,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
//return errString; //return errString;
} }
else else
{ {*/
/* /*
sql = "select count(1) from inv_hold where ref_id ='" + refIdTo + "'"; sql = "select count(1) from inv_hold where ref_id ='" + refIdTo + "'";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -303,7 +312,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -303,7 +312,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
*/ */
} //}
/* /*
if ( autoConfirmed == null ) if ( autoConfirmed == null )
{ {
...@@ -312,6 +321,19 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -312,6 +321,19 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
return errString; return errString;
} }
*/ */
/*if ( lotNoFrom == null || lotNoFrom.trim().length() == 0 )
{
System.out.println("lotNoFrom is Null...");
errString = itmDBAccessEJB.getErrorString("","VMINVLTFR","","",conn);
return errString;
}
if ( lotNoTo == null || lotNoTo.trim().length() == 0 )
{
System.out.println("lotNoTo is Null...");
errString = itmDBAccessEJB.getErrorString("","VMINVLTTO","","",conn);
return errString;
}*/
System.out.println("refIdFrom["+refIdFrom+"]:::::::refIdTo["+refIdTo+"]"); System.out.println("refIdFrom["+refIdFrom+"]:::::::refIdTo["+refIdTo+"]");
//ih.lock_code ,ihd.lot_no,ihd.lot_sl,ihd.remarks ADDED BY RITESH //ih.lock_code ,ihd.lot_no,ihd.lot_sl,ihd.remarks ADDED BY RITESH
getDataSql= " select ihd.tran_id,ihd.line_no,ihd.line_no_sl," + getDataSql= " select ihd.tran_id,ihd.line_no,ihd.line_no_sl," +
...@@ -321,6 +343,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -321,6 +343,7 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
" from inv_hold_det ihd,inv_hold ih where ( ihd.tran_id = ih.tran_id )" + " from inv_hold_det ihd,inv_hold ih where ( ihd.tran_id = ih.tran_id )" +
" and ( ihd.tran_id >= ? and ihd.tran_id <= ? ) and ( ih.lock_code >= ? and ih.lock_code <= ? )" + " and ( ihd.tran_id >= ? and ihd.tran_id <= ? ) and ( ih.lock_code >= ? and ih.lock_code <= ? )" +
" and ( ihd.sch_rel_date between ? and ? ) and ihd.hold_status <> 'R' " " and ( ihd.sch_rel_date between ? and ? ) and ihd.hold_status <> 'R' "
+" and ( ihd.lot_no >= '"+lotNoFrom+"' and ihd.lot_no <= '"+lotNoTo+"' ) and ih.confirmed='Y' " //Added by Manoj dtd 15/04/2014 to retrieve data based on entered lot No range
+ " and nvl((select count(1) from inv_hold_rel_det r where r.tran_id__hold = ihd.tran_id and r.line_no__hold = ihd.line_no ),0) = 0 "; // 14/04/14 manoharan this condition added + " and nvl((select count(1) from inv_hold_rel_det r where r.tran_id__hold = ihd.tran_id and r.line_no__hold = ihd.line_no ),0) = 0 "; // 14/04/14 manoharan this condition added
//and ( ihd.lock_code between ? and ? ) //and ( ihd.lock_code between ? and ? )
if(refIdFrom != null ) if(refIdFrom != null )
...@@ -368,13 +391,13 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -368,13 +391,13 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
//tran_id //tran_id
//retTabSepStrBuff.append((rs1.getString(1)==null?" ":rs1.getString(1))).append("\t"); //retTabSepStrBuff.append((rs1.getString(1)==null?" ":rs1.getString(1))).append("\t");
retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" + (rs1.getString(1)==null?" ":rs1.getString(1)) +"]]>").append("</tran_id>"); //retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" + (rs1.getString(1)==null?" ":rs1.getString(1)) +"]]>").append("</tran_id>");
//line_no //line_no
//retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t"); //retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t");
retTabSepStrBuff.append("<line_no>").append("<![CDATA[" + (rs1.getString(2)==null?" ":rs1.getString(2)) +"]]>").append("</line_no>"); //retTabSepStrBuff.append("<line_no>").append("<![CDATA[" + (rs1.getString(2)==null?" ":rs1.getString(2)) +"]]>").append("</line_no>");
//line_no_sl //line_no_sl
//retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t"); //retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t");
retTabSepStrBuff.append("<line_no_sl>").append("<![CDATA[" + (rs1.getString(3)==null?" ":rs1.getString(3)) +"]]>").append("</line_no_sl>"); //retTabSepStrBuff.append("<line_no_sl>").append("<![CDATA[" + (rs1.getString(3)==null?" ":rs1.getString(3)) +"]]>").append("</line_no_sl>");
//hold_status //hold_status
if(rs1.getString(4)!=null) if(rs1.getString(4)!=null)
{ {
...@@ -439,6 +462,17 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv ...@@ -439,6 +462,17 @@ public class InvHoldRelGen extends ProcessEJB implements InvHoldRelGenLocal, Inv
descpstmt = null; descpstmt = null;
descrs.close(); descrs.close();
descrs = null; descrs = null;
//changed squence order of tran_id,line_no,line_no_sl y mahendra dated 16/APR/14
retTabSepStrBuff.append("<tran_id>").append("<![CDATA[" + (rs1.getString(1)==null?" ":rs1.getString(1)) +"]]>").append("</tran_id>");
//line_no
//retTabSepStrBuff.append((rs1.getString(2)==null?" ":rs1.getString(2))).append("\t");
retTabSepStrBuff.append("<line_no>").append("<![CDATA[" + (rs1.getString(2)==null?" ":rs1.getString(2)) +"]]>").append("</line_no>");
//line_no_sl
//retTabSepStrBuff.append((rs1.getString(3)==null?" ":rs1.getString(3))).append("\t");
retTabSepStrBuff.append("<line_no_sl>").append("<![CDATA[" + (rs1.getString(3)==null?" ":rs1.getString(3)) +"]]>").append("</line_no_sl>");
//hold_status
//ADDED BY RITESH ON 25/DEC/13 FOR SET ITEM DESCR. AND LOCK CODE DESC. end //ADDED BY RITESH ON 25/DEC/13 FOR SET ITEM DESCR. AND LOCK CODE DESC. end
//site_code //site_code
...@@ -641,6 +675,7 @@ public String process(String xmlString, String xmlString2, String windowName, St ...@@ -641,6 +675,7 @@ public String process(String xmlString, String xmlString2, String windowName, St
String childNodeName = ""; String childNodeName = "";
boolean isConn= false; // added by cpatil on 29/05/13 boolean isConn= false; // added by cpatil on 29/05/13
String lotNo="";//Added by manoj dtd 15/04/2014 to update lotNo in inv_hold_rel table
try try
{ {
...@@ -694,6 +729,8 @@ public String process(String xmlString, String xmlString2, String windowName, St ...@@ -694,6 +729,8 @@ public String process(String xmlString, String xmlString2, String windowName, St
updCnt = pRelHdr.executeUpdate(); updCnt = pRelHdr.executeUpdate();
pRelHdr.clearParameters(); pRelHdr.clearParameters();
pRelHdr.close();
pRelHdr=null;
if( updCnt > 0 ) if( updCnt > 0 )
{ {
System.out.println( updCnt + "INV_HOLD_REL rows inserted successfully" ); System.out.println( updCnt + "INV_HOLD_REL rows inserted successfully" );
...@@ -750,6 +787,7 @@ public String process(String xmlString, String xmlString2, String windowName, St ...@@ -750,6 +787,7 @@ public String process(String xmlString, String xmlString2, String windowName, St
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
parentNodeListLength = parentNodeList.getLength(); parentNodeListLength = parentNodeList.getLength();
//System.out.println("parentNodeListLength------------------->"+parentNodeListLength); //System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
HashSet<String> lotSet=new HashSet<String>();
for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++) for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
{ {
parentNode = parentNodeList.item(selectedRow); parentNode = parentNodeList.item(selectedRow);
...@@ -770,6 +808,11 @@ public String process(String xmlString, String xmlString2, String windowName, St ...@@ -770,6 +808,11 @@ public String process(String xmlString, String xmlString2, String windowName, St
{ {
lineNo = childNode.getFirstChild().getNodeValue(); lineNo = childNode.getFirstChild().getNodeValue();
} }
if (childNodeName.equals("lot_no"))
{
lotNo = childNode.getFirstChild().getNodeValue();
lotSet.add(lotNo);
}
} }
ctr++; ctr++;
pRelDet.setString( 1, tranIdGenerate ); pRelDet.setString( 1, tranIdGenerate );
...@@ -784,6 +827,21 @@ public String process(String xmlString, String xmlString2, String windowName, St ...@@ -784,6 +827,21 @@ public String process(String xmlString, String xmlString2, String windowName, St
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
pRelDet.executeBatch(); pRelDet.executeBatch();
pRelDet.clearBatch(); pRelDet.clearBatch();
Iterator<String> itr=lotSet.iterator();
String strLotNo="";
while(itr.hasNext())
{
strLotNo+=itr.next()+",";
}
if(strLotNo.trim().length()>0)
{
strLotNo=strLotNo.substring(0, strLotNo.length()-1);
}
lotSet.clear();
pRelHdr=conn.prepareStatement("UPDATE INV_HOLD_REL SET LOT_INFO='"+strLotNo+"' WHERE TRAN_ID=? ");
pRelHdr.setString(1, tranIdGenerate);
pRelHdr.executeUpdate();
if("Y".equalsIgnoreCase(autoConfirmed)) if("Y".equalsIgnoreCase(autoConfirmed))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment