Skip to content

B
business-java
Commit e7948877 authored by rtiwari's avatar rtiwari
Browse files
Options

validation added for close/cancel DO 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94048 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 843c1541
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 4 deletions
webitm-dis/ibase/webitm/ejb/dis/DistOrderAmdIC.java
View file @ e7948877
...@@ -127,6 +127,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -127,6 +127,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
} }
if( distOrder != null && distOrder.trim().length() > 0 ) if( distOrder != null && distOrder.trim().length() > 0 )
{ {
sql = " SELECT COUNT(*) FROM distorder WHERE dist_order = ? "; sql = " SELECT COUNT(*) FROM distorder WHERE dist_order = ? ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim()); pstmt.setString(1,distOrder.trim());
...@@ -136,16 +137,41 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -136,16 +137,41 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
{ {
cnt = rs.getInt( 1 ); cnt = rs.getInt( 1 );
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( cnt == 0 ) if( cnt == 0 )
{ {
errCode = "INDISTORD"; errCode = "INDISTORD";
errString = getErrorString( "dist_order", errCode, userId ); errString = getErrorString( "dist_order", errCode, userId );
return errString;
} }
//ADDED BY RITESH FOR DI3HSUP004 START
else{
sql = " SELECT COUNT(*) FROM DISTORDER WHERE DIST_ORDER = ? AND STATUS NOT IN ('X','C') ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim());
rs = pstmt.executeQuery();
cnt = 0;
if( rs.next() )
{
cnt = rs.getInt( 1 );
}
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if( cnt == 0 )
{
errCode = "VTDISORDXC";
errString = getErrorString( "dist_order", errCode, userId );
return errString;
}
}
//ADDED BY RITESH FOR DI3HSUP004 END
} }
} }
if ( childNodeName.equalsIgnoreCase( "purc_order" ) ) if ( childNodeName.equalsIgnoreCase( "purc_order" ) )
...@@ -240,7 +266,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -240,7 +266,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
if( lineNoOrder != null && lineNoOrder.trim().length() > 0 ) if( lineNoOrder != null && lineNoOrder.trim().length() > 0 )
{ {
// SQL CHANGE BY RITESH FOR DI3HSUP004 // SQL CHANGE BY RITESH FOR DI3HSUP004
sql = " SELECT COUNT(*) FROM distorder_det WHERE dist_order = ? and line_no = ? and status = 'O' "; sql = " SELECT COUNT(*) FROM distorder_det WHERE dist_order = ? and line_no = ? ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim()); pstmt.setString(1,distOrder.trim());
pstmt.setInt(2,Integer.parseInt(lineNoOrder.trim())); pstmt.setInt(2,Integer.parseInt(lineNoOrder.trim()));
...@@ -250,15 +276,37 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -250,15 +276,37 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
{ {
cnt = rs.getInt( 1 ); cnt = rs.getInt( 1 );
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if( cnt == 0 ) if( cnt == 0 )
{ {
errCode = "INLINENO"; errCode = "INLINENO";
errString = getErrorString( "line_no_distord", errCode, userId ); errString = getErrorString( "line_no_distord", errCode, userId );
return errString;
} }
sql = " SELECT COUNT(*) FROM distorder_det WHERE dist_order = ? and line_no = ? and status = 'O' ";
pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim());
pstmt.setInt(2,Integer.parseInt(lineNoOrder.trim()));
rs = pstmt.executeQuery();
cnt = 0;
if( rs.next() )
{
cnt = rs.getInt( 1 );
}
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if( cnt == 0 )
{
errCode = "VTINDISORD";
errString = getErrorString( "line_no_distord", errCode, userId );
return errString;
}
} }
} }
if ( childNodeName.equalsIgnoreCase( "dist_order" ) ) if ( childNodeName.equalsIgnoreCase( "dist_order" ) )
...@@ -350,7 +398,27 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -350,7 +398,27 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
}
// ADDED BY RITESH FOR DI3HSUP004 START
if ( childNodeName.equalsIgnoreCase( "qty_order" ) )
{
String qtyorderstr1 = genericUtility.getColumnValue( "qty_order", dom );
if(qtyorderstr1 == null)
{
errCode = "VTQTYNULL";
errString = getErrorString( "qty_order", errCode, userId );
return errString;
}
double qtyorder = 0;
if(qtyorderstr1 != null)qtyorder = Double.parseDouble(qtyorderstr1);
if( qtyorder <= 0 )
{
errCode = "VTQTYNVE";
errString = getErrorString( "qty_order", errCode, userId );
return errString;
}
} }
// ADDED BY RITESH FOR DI3HSUP004 END
}//END FOR LOOP OF CASE2 }//END FOR LOOP OF CASE2
}//END SWITCH }//END SWITCH
}//END TRY }//END TRY
...@@ -824,6 +892,14 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -824,6 +892,14 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
valueXmlString.append("<qty_order protect =\"1\">").append(qtyOrder).append("</qty_order>"); valueXmlString.append("<qty_order protect =\"1\">").append(qtyOrder).append("</qty_order>");
valueXmlString.append("<rate protect =\"1\">").append(rate).append("</rate>"); valueXmlString.append("<rate protect =\"1\">").append(rate).append("</rate>");
} }
valueXmlString.append("<status>").append("O").append("</status>");
}
if (currentColumn.trim().equals( "itm_defaultedit" ))
{
String status = genericUtility.getColumnValue( "status", dom1 );
// valueXmlString.append("<status protect = '0'>").append(status).append("</status>");
} }
if (currentColumn.trim().equals( "line_no_distord" )) if (currentColumn.trim().equals( "line_no_distord" ))
{ {
...@@ -1017,7 +1093,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -1017,7 +1093,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
valueXmlString.append("<qty_received_o>").append("<![CDATA[" + ( qtyReceived != null ? qtyReceived.trim() : "" )+ "]]>").append("</qty_received_o>"); valueXmlString.append("<qty_received_o>").append("<![CDATA[" + ( qtyReceived != null ? qtyReceived.trim() : "" )+ "]]>").append("</qty_received_o>");
valueXmlString.append("<qty_confirm_o>").append("<![CDATA[" + ( qtyConfirm != null ? qtyConfirm.trim() : "" )+ "]]>").append("</qty_confirm_o>"); valueXmlString.append("<qty_confirm_o>").append("<![CDATA[" + ( qtyConfirm != null ? qtyConfirm.trim() : "" )+ "]]>").append("</qty_confirm_o>");
valueXmlString.append("<status>").append("<![CDATA[" + ( status != null ? status.trim() : "" )+ "]]>").append("</status>"); // ADDED BY RITESH FOR DI3HSUP004 // valueXmlString.append("<status>").append("<![CDATA[" + ( status != null ? status.trim() : "" )+ "]]>").append("</status>"); // ADDED BY RITESH FOR DI3HSUP004
} }
...@@ -1048,7 +1124,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -1048,7 +1124,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
unit = genericUtility.getColumnValue( "unit_o", dom ); unit = genericUtility.getColumnValue( "unit_o", dom );
itemCode = genericUtility.getColumnValue( "item_code", dom ); itemCode = genericUtility.getColumnValue( "item_code", dom );
isQtyOrder = Double.parseDouble( qtyOrder ); if(qtyOrder != null) isQtyOrder = Double.parseDouble( qtyOrder );
returnValue = distComm.getConvQuantityFact( unit, unitAlt, itemCode, isQtyOrder, 0.0, conn ); returnValue = distComm.getConvQuantityFact( unit, unitAlt, itemCode, isQtyOrder, 0.0, conn );
lc_fact = (String)returnValue.get(0); lc_fact = (String)returnValue.get(0);
qtyOrder = (String)returnValue.get(1); qtyOrder = (String)returnValue.get(1);
......
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