Skip to content

B
business-java
Commit 62bce3b6 authored by cpatil's avatar cpatil
Browse files
Options

modify for item series and item code 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92743 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d93cef91
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 20 deletions
webitm-dis/ibase/webitm/ejb/dis/CommissiondetIC.java
View file @ 62bce3b6
...@@ -82,7 +82,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -82,7 +82,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
int ctr1=0,k=0,l=1; int ctr1=0,k=0,l=1;
String dateStr=null,itemCodeTemp="",itemSerTemp="",validUptoTemp="",itemSerTempLast="",itemCodeTempLast=""; String dateStr=null,itemCodeTemp="",itemSerTemp="",validUptoTemp="",itemSerTempLast="",itemCodeTempLast="";
String itminfo ="";
java.sql.Timestamp validUptoTemp2=null; java.sql.Timestamp validUptoTemp2=null;
...@@ -250,14 +250,25 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -250,14 +250,25 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
{ {
System.out.println("validation item series executed"); System.out.println("validation item series executed");
itemSer = genericUtility.getColumnValue("item_ser",dom); itemSer = genericUtility.getColumnValue("item_ser",dom);
itemCode = genericUtility.getColumnValue("item_code",dom);
if( itemSer == null || itemSer.trim().length() == 0) if( itemSer == null || itemSer.trim().length() == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VMITMSERN",userId); // errString = itmDBAccessEJB.getErrorString("","VMITMSERN",userId);
break ; // break ;
} }
else else
{ {
sql = "SELECT COUNT(1) FROM ITEM WHERE ITEM_SER = ? "; if( itemSer != null && itemSer.trim().length() > 0 && itemCode != null && itemCode.trim().length() > 0)
{
errString = itmDBAccessEJB.getErrorString("","VMICOSERIN",userId);
break ;
}
else if( ( itemSer == null || itemSer.trim().length() == 0 ) && ( itemCode == null || itemCode.trim().length() == 0))
{
errString = itmDBAccessEJB.getErrorString("","VMICOSERNU",userId);
break ;
}
sql = "SELECT COUNT(1) FROM ITEMSER WHERE ITEM_SER = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, itemSer ); pstmt.setString( 1, itemSer );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -285,18 +296,20 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -285,18 +296,20 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
if( itemCode == null || itemCode.trim().length() == 0) if( itemCode == null || itemCode.trim().length() == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VMITMCODNU",userId); // errString = itmDBAccessEJB.getErrorString("","VMITMCODNU",userId);
break ; // break ;
} }
else else
{ {
if( itemSer != null && itemSer.trim().length() > 0 ) if( itemSer != null && itemSer.trim().length() > 0 && itemCode != null && itemCode.trim().length() > 0)
{ {
errString = itmDBAccessEJB.getErrorString("","VMICOSERIN",userId);
break ;
}
sql = "SELECT COUNT(1) FROM ITEM WHERE ITEM_CODE = ? AND ITEM_SER = ? "; sql = "SELECT COUNT(1) FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, itemCode ); pstmt.setString( 1, itemCode );
pstmt.setString( 2, itemSer );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -312,7 +325,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -312,7 +325,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
errString = itmDBAccessEJB.getErrorString("","VMITMSRINV",userId); errString = itmDBAccessEJB.getErrorString("","VMITMSRINV",userId);
break ; break ;
} }
}
} }
} }
...@@ -417,7 +430,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -417,7 +430,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
} //END switch } //END switch
boolean res = duplicateCheck (dom,dom2,itemCode,itemSer,effDateStr,validUptoStr,lineNo); //comment by kunal on 22/02/13
itminfo = itemCode + itemSer;
boolean res = duplicateCheck (dom,dom2,itminfo,effDateStr,validUptoStr,lineNo); //comment by kunal on 22/02/13
System.out.println("@@@@ res::"+res); System.out.println("@@@@ res::"+res);
if( res == true ) if( res == true )
{ {
...@@ -674,9 +689,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -674,9 +689,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
return valueXmlString.toString(); return valueXmlString.toString();
}//End of itemChanged }//End of itemChanged
public boolean duplicateCheck (Document dom,Document dom2,String pitemCode,String pitemSer,String peffDateStr,String pvalidUptoStr,String plineNo) throws Exception public boolean duplicateCheck (Document dom,Document dom2,String pitminfo,String peffDateStr,String pvalidUptoStr,String plineNo) throws Exception
{ {
String lineNo="",commTable="",itemSer="",itemCode="",effDateStr="",validUptoStr=""; String lineNo="",commTable="",itemSer="",itemCode="",effDateStr="",validUptoStr="",itminfo="";
String effDateTemp=null ; String effDateTemp=null ;
Timestamp effDateTemp2=null ,ValidUptoLastTemp=null, ValidUptoLastTemp2=null,peffDate=null,pvalidUpto=null; Timestamp effDateTemp2=null ,ValidUptoLastTemp=null, ValidUptoLastTemp2=null,peffDate=null,pvalidUpto=null;
String errString = "",editFlag=""; String errString = "",editFlag="";
...@@ -695,7 +710,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -695,7 +710,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
{ {
noOfParent = detail2List.getLength(); noOfParent = detail2List.getLength();
System.out.println("@@@@@@@@ noOfParent [["+noOfParent +"]]"); System.out.println("@@@@@@@@ noOfParent [["+noOfParent +"]]");
System.out.println("@@@@ pitemCode:["+pitemCode+"]::::pitemSer["+pitemSer+"]::lineNo:["+lineNo+"]"); System.out.println("@@@@ pitminfo:["+pitminfo+"]::lineNo:["+lineNo+"]");
if( peffDateStr != null && pvalidUptoStr !=null && peffDateStr.trim().length() > 0 && pvalidUptoStr.trim().length() > 0 ) if( peffDateStr != null && pvalidUptoStr !=null && peffDateStr.trim().length() > 0 && pvalidUptoStr.trim().length() > 0 )
{ {
...@@ -711,6 +726,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -711,6 +726,7 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
effDateStr = genericUtility.getColumnValueFromNode( "eff_date", detail2List.item(ctr1) ); effDateStr = genericUtility.getColumnValueFromNode( "eff_date", detail2List.item(ctr1) );
validUptoStr = genericUtility.getColumnValueFromNode( "valid_upto", detail2List.item(ctr1) ); validUptoStr = genericUtility.getColumnValueFromNode( "valid_upto", detail2List.item(ctr1) );
itemSer = genericUtility.getColumnValueFromNode( "item_ser", detail2List.item(ctr1) ); itemSer = genericUtility.getColumnValueFromNode( "item_ser", detail2List.item(ctr1) );
editFlag = genericUtility.getColumnValueFromNode( "edit_flag", detail2List.item(ctr1) ); editFlag = genericUtility.getColumnValueFromNode( "edit_flag", detail2List.item(ctr1) );
lineNo = genericUtility.getColumnValueFromNode( "line_no", detail2List.item(ctr1) ); lineNo = genericUtility.getColumnValueFromNode( "line_no", detail2List.item(ctr1) );
...@@ -718,9 +734,10 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -718,9 +734,10 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
dateStr = validUptoStr+"@"+effDateStr ; dateStr = validUptoStr+"@"+effDateStr ;
System.out.println("dateStr[[[[[[[["+dateStr+"]]]]]]]]]"); System.out.println("dateStr[[[[[[[["+dateStr+"]]]]]]]]]");
if( ( pitemCode.trim().equalsIgnoreCase( itemCode.trim() )) && ( pitemSer.trim().equalsIgnoreCase(itemSer.trim() ) ) && ( !( plineNo.trim().equalsIgnoreCase(lineNo.trim() ) ))) itminfo = itemCode + itemSer;
{
if(( ( pitminfo.equalsIgnoreCase( itminfo ))) && ( !( plineNo.trim().equalsIgnoreCase(lineNo.trim() ) )))
{
arrLstDate.add(dateStr); arrLstDate.add(dateStr);
System.out.println("@@@@ added in arraylist"); System.out.println("@@@@ added in arraylist");
} }
......
webitm-dis/ibase/webitm/ejb/dis/CommissiondetPos.java
View file @ 62bce3b6
...@@ -80,11 +80,17 @@ public class CommissiondetPos extends ValidatorEJB implements CommissiondetPosL ...@@ -80,11 +80,17 @@ public class CommissiondetPos extends ValidatorEJB implements CommissiondetPosL
itemSer= rs2.getString("item_ser"); itemSer= rs2.getString("item_ser");
validUptoLast = null; validUptoLast = null;
lineNoLast = null; lineNoLast = null;
sql = " select line_no,eff_date,valid_upto FROM comm_det where comm_table = ? and item_code=? and item_ser= ? order by eff_date asc " ; //sql = " select line_no,eff_date,valid_upto FROM comm_det where comm_table = ? and item_code=? and item_ser= ? order by eff_date asc " ;
sql="select line_no,eff_date,valid_upto FROM" +
" (select line_no,eff_date,valid_upto from comm_det where comm_table =? and item_code=?" +
" UNION ALL " +
"select line_no,eff_date,valid_upto from comm_det where comm_table = ? and item_ser=? " +
" ) ORDER BY eff_date asc";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,commTable); pstmt.setString(1,commTable);
pstmt.setString(2,itemCode); pstmt.setString(2,itemCode);
pstmt.setString(3,itemSer); pstmt.setString(3,commTable);
pstmt.setString(4,itemSer);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
......
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