Skip to content

B
business-java
Commit 8bb5e937 authored by manohar's avatar manohar
Browse files
Options

third and fourth screen lot_sl__new and loc_code__to properly set in case... 

third and fourth screen lot_sl__new and loc_code__to properly set in case issue already saved and is in edit mode


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91966 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7819151a
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 16 deletions
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 8bb5e937
...@@ -2956,7 +2956,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -2956,7 +2956,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
sql = "SELECT RID.TRAN_ID, RID.LINE_NO, RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+ sql = "SELECT RID.TRAN_ID, RID.LINE_NO, RID.REPL_ORDER, RID.LINE_NO__ORD, RID.SITE_CODE, RID.ITEM_CODE, RID.LOC_CODE, RID.LOT_NO, "+
" RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT,RID.LOC_CODE__SYS as LOC_CODE__SYS"+ " RID.LOT_SL, RID.QUANTITY, RID.NO_ART, RID.LOC_CODE__TO, ITEM.DESCR ITEM_DESCR, ITEM.UNIT UNIT,RID.LOC_CODE__SYS as LOC_CODE__SYS, RID.LOT_SL__NEW"+
" FROM REPL_ISS_DET RID, ITEM ITEM WHERE RID.TRAN_ID = ? AND RID.ITEM_CODE = ITEM.ITEM_CODE ORDER BY LINE_NO "; " FROM REPL_ISS_DET RID, ITEM ITEM WHERE RID.TRAN_ID = ? AND RID.ITEM_CODE = ITEM.ITEM_CODE ORDER BY LINE_NO ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
...@@ -2990,17 +2990,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -2990,17 +2990,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//changes made by chitranjan for suggested location code //23/11/11 //changes made by chitranjan for suggested location code //23/11/11
//valueXmlString.append( "<loc_code__sys><![CDATA[" ).append( rs.getString("LOC_CODE__TO") ).append( "]]></loc_code__sys>\r\n" ); //valueXmlString.append( "<loc_code__sys><![CDATA[" ).append( rs.getString("LOC_CODE__TO") ).append( "]]></loc_code__sys>\r\n" );
System.out.println("loc code sys="+rs.getString("LOC_CODE__SYS")); System.out.println("loc code sys="+rs.getString("LOC_CODE__SYS"));
// 12/10/12 manoharan issue is already saved so set the lot_sl__new from issue
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append( rs.getString("LOC_CODE__SYS") ).append( "]]></loc_code__sys>\r\n" ); //change done by kunal on 01/09/12 valueXmlString.append( "<loc_code__sys><![CDATA[" ).append( rs.getString("LOC_CODE__SYS") ).append( "]]></loc_code__sys>\r\n" ); //change done by kunal on 01/09/12
// valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(locCodeto ).append( "]]></loc_code__sys>\r\n" ); //Changed By Mahesh Patidar on 08/08/12 // valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(locCodeto ).append( "]]></loc_code__sys>\r\n" ); //Changed By Mahesh Patidar on 08/08/12
//if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick
if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick //{
{ // valueXmlString.append( "<lot_sl__new><![CDATA[]]></lot_sl__new>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[]]></lot_sl__new>\r\n" ); //}
} //else
else //{
{ valueXmlString.append( "<lot_sl__new><![CDATA[" ).append( checkNullAndTrim( rs.getString("LOT_SL__NEW") )).append( "]]></lot_sl__new>\r\n" );
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append( checkNullAndTrim( rs.getString("LOT_SL") )).append( "]]></lot_sl__new>\r\n" ); //}
}
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
rs.close(); rs = null; rs.close(); rs = null;
...@@ -3144,10 +3144,33 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3144,10 +3144,33 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
if("Y".equalsIgnoreCase(selected)) if("Y".equalsIgnoreCase(selected))
{ {
tranId = genericUtility.getColumnValueFromNode("tran_id", parentNode) ;
int lineNo = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no", parentNode));
sql = "SELECT COUNT(1) FROM REPL_ISS_DET WHERE TRAN_ID = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, tranId );
pstmt.setInt( 2, lineNo );
rs = pstmt.executeQuery();
if (rs.next())
{
valueXmlString.append( "<Detail4 domID='"+(lineNo)+"' selected=\"Y\">\r\n" ); //commet by kunal 03/09/12
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); //added by Kunal on 03/09/12
valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(genericUtility.getColumnValueFromNode("loc_code__sys", parentNode))).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[" ).append(checkNullAndTrim(genericUtility.getColumnValueFromNode("loc_code__to", parentNode))).append( "]]></loc_code__to>\r\n" );
}
else
{
valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' selected=\"Y\">\r\n" ); //commet by kunal 03/09/12
//valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); //added by Kunal on 03/09/12
valueXmlString.append( "<tran_id/>" ); valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(genericUtility.getColumnValueFromNode("loc_code__sys", parentNode))).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[]]></loc_code__to>\r\n" );
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
valueXmlString.append( "<line_no><![CDATA[" ).append( genericUtility.getColumnValueFromNode("line_no", parentNode) ).append( "]]></line_no>\r\n" );//changed by gulzar on 12/22/2011 valueXmlString.append( "<line_no><![CDATA[" ).append( genericUtility.getColumnValueFromNode("line_no", parentNode) ).append( "]]></line_no>\r\n" );//changed by gulzar on 12/22/2011
valueXmlString.append( "<item_code><![CDATA[" ).append( genericUtility.getColumnValueFromNode("item_code", parentNode)).append( "]]></item_code>\r\n" ); valueXmlString.append( "<item_code><![CDATA[" ).append( genericUtility.getColumnValueFromNode("item_code", parentNode)).append( "]]></item_code>\r\n" );
valueXmlString.append( "<item_descr><![CDATA[" ).append( genericUtility.getColumnValueFromNode("item_descr", parentNode)).append( "]]></item_descr>\r\n" ); valueXmlString.append( "<item_descr><![CDATA[" ).append( genericUtility.getColumnValueFromNode("item_descr", parentNode)).append( "]]></item_descr>\r\n" );
...@@ -3161,8 +3184,6 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3161,8 +3184,6 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(checkNullAndTrim( genericUtility.getColumnValueFromNode("lot_sl__new", parentNode))).append( "]]></lot_sl__new>\r\n" ); valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(checkNullAndTrim( genericUtility.getColumnValueFromNode("lot_sl__new", parentNode))).append( "]]></lot_sl__new>\r\n" );
// end 13/09/12 manoharan new lpn number to be matched // end 13/09/12 manoharan new lpn number to be matched
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(genericUtility.getColumnValueFromNode("loc_code__sys", parentNode))).append( "]]></loc_code__sys>\r\n" );
valueXmlString.append( "<loc_code__to><![CDATA[]]></loc_code__to>\r\n" );
valueXmlString.append("</Detail4>\r\n"); valueXmlString.append("</Detail4>\r\n");
} }
} }
......
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