Commit db986766 authored by ppatro's avatar ppatro

To merge src for WMS updated wave gen changes.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91969 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f499f7f9
...@@ -2119,7 +2119,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal ...@@ -2119,7 +2119,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
valueXmlString.append( "<chg_date><![CDATA[" ).append( checkNull(currDateStr) ).append( "]]></chg_date>\r\n" ); valueXmlString.append( "<chg_date><![CDATA[" ).append( checkNull(currDateStr) ).append( "]]></chg_date>\r\n" );
valueXmlString.append( "<chg_user><![CDATA[" ).append( checkNull(userId) ).append( "]]></chg_user>\r\n" ); valueXmlString.append( "<chg_user><![CDATA[" ).append( checkNull(userId) ).append( "]]></chg_user>\r\n" );
valueXmlString.append( "<chg_term><![CDATA[" ).append( checkNull(chgTerm) ).append( "]]></chg_term>\r\n" ); valueXmlString.append( "<chg_term><![CDATA[" ).append( checkNull(chgTerm) ).append( "]]></chg_term>\r\n" );
valueXmlString.append( "<freight_status><![CDATA[O]]></freight_status>\r\n" ); valueXmlString.append( "<freight_status><![CDATA[B]]></freight_status>\r\n" );
// 26/10/11 manoharan qc_reqd added // 26/10/11 manoharan qc_reqd added
valueXmlString.append( "<qc_reqd><![CDATA[" ).append( qcReqd ).append( "]]></qc_reqd>\r\n" ); valueXmlString.append( "<qc_reqd><![CDATA[" ).append( qcReqd ).append( "]]></qc_reqd>\r\n" );
// end 26/10/11 manoharan qc_reqd added // end 26/10/11 manoharan qc_reqd added
......
...@@ -3145,9 +3145,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3145,9 +3145,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
{ {
tranId = genericUtility.getColumnValueFromNode("tran_id", parentNode) ; tranId = genericUtility.getColumnValueFromNode("tran_id", parentNode) ;
int lineNo = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no", parentNode)); int lineNo = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no", parentNode).trim());
sql = "SELECT COUNT(1) FROM REPL_ISS_DET WHERE TRAN_ID = ? AND LINE_NO = ? "; /*sql = "SELECT COUNT(1) FROM REPL_ISS_DET WHERE TRAN_ID = ? AND LINE_NO = ? ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, tranId ); pstmt.setString( 1, tranId );
pstmt.setInt( 2, lineNo ); pstmt.setInt( 2, lineNo );
...@@ -3171,7 +3171,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3171,7 +3171,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; 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( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
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" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNo ).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" );
valueXmlString.append( "<site_code><![CDATA[" ).append( genericUtility.getColumnValueFromNode("site_code", parentNode)).append( "]]></site_code>\r\n" ); valueXmlString.append( "<site_code><![CDATA[" ).append( genericUtility.getColumnValueFromNode("site_code", parentNode)).append( "]]></site_code>\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