Skip to content

B
business-java
Commit 3a4e1ef9 authored by ssarkar's avatar ssarkar
Browse files
Options

update by sumit on 26/02/13 for issue tracker point 119 (Active clubbing) . BUG SOLVED 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92748 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f80f14bf
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 13 deletions
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 3a4e1ef9
......@@ -203,8 +203,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
{
currentFormNo = Integer.parseInt( objContext );
}
objName = checkNullAndTrim(getObjNameFromDom( currFormDataDom, "objName", objContext ));
objName = checkNullAndTrim(getObjNameFromDom( hdrDataDom, "objName", "1" ));
System.out.println(" objName =[" + objName + "]");
NodeList parentList = currFormDataDom.getElementsByTagName( "Detail" + currentFormNo );
......@@ -3708,8 +3708,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//Added By Mahesh Patidar on 31/07/12
case 4:
{
//Changed by sumit on 26/03/13 create new variable for dom id
int newInt = 0;
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
{
parentNodeList = allFormDataDom.getElementsByTagName("Detail3");
......@@ -3728,7 +3728,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
System.out.println("value of selected the detail["+selected+"]");
if("Y".equalsIgnoreCase(selected))
{
newInt++; //Changed by sumit on 26/02/13 increament domID here
tranId = genericUtility.getColumnValueFromNode("tran_id", parentNode) ;
int lineNo = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no", parentNode).trim());
......@@ -3789,6 +3790,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
lotSlNew = genericUtility.getColumnValueFromNode("lot_sl__new", parentNode);
replOrder = genericUtility.getColumnValueFromNode("repl_order", parentNode);
lineNoOrd = Integer.parseInt(genericUtility.getColumnValueFromNode("line_no__ord", parentNode));
System.out.println("itemCode ----- ["+itemCode+"]");
//Changed by sumit on 19/02/13 modifide sql as this is wrong.
//sql = "SELECT POD.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POD WHERE ROD.PICK_ORDER = POD.PICK_ORDER AND ROD.REPL_ORDER = ?";
sql = " SELECT DISTINCT POH.PICK_TYPE , ROD.ITEM_CODE FROM REPL_ORD_DET ROD,PICK_ORD_HDR POH , PICK_ORD_DET POD " +
......@@ -3799,7 +3801,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
if (rs.next())
{
pickType = checkNull(rs.getString("PICK_TYPE"));
itemCode = checkNull(rs.getString("ITEM_CODE"));//Added By Mahesh Patidar on 07/08/12
//itemCode = checkNull(rs.getString("ITEM_CODE"));//Added By Mahesh Patidar on 07/08/12
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
......@@ -3832,8 +3834,10 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
rs = pstmt.executeQuery();
if( rs.next() )
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" ); newInt
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+newInt+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
......@@ -3854,7 +3858,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
else
{
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"'>\r\n" );
valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
//Changed by sumit on 26/02/13 changed dom id.
//valueXmlString.append( "<Detail4 domID='"+(ctr+1)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail4 domID='"+(newInt)+"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append( "<tran_id/>" );
valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(locCodeSys)).append( "]]></loc_code__sys>\r\n" );
......@@ -4199,6 +4205,10 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
{
currDetail = detailList.item(ctr);
objName = currDetail.getAttributes().getNamedItem(attribute).getNodeValue();
if( objName != null && objName.trim().length() > 0)
{
return objName;
}
}
}
catch ( Exception e )
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssPos.java
View file @ 3a4e1ef9
......@@ -501,10 +501,10 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
}
pstmt.close(); pstmt = null;
if( noArt == 1 )
/*if( noArt == 1 )
{
continue;
}
}*/
System.out.println(" **********-----------**********");
sql = " SELECT REPL_ORDER, LINE_NO, QUANTITY, NO_ART FROM REPL_ORD_DET WHERE REPL_ORDER = ? " +
......@@ -576,7 +576,7 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, tranId);
pstmt2.setDouble(2, tranLine);
pstmt2.setInt(2, rs.getInt("LINE_NO"));
pstmt2.setString(3, replOrder);
pstmt2.setInt(4, rs.getInt("LINE_NO"));
pstmt2.setString(5, itemCode);
......@@ -629,7 +629,7 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
System.out.println(" itemCode ["+itemCode+"] siteCode ["+siteCode+"] locCode["+locCode+"] lotNo["+lotNo+"] lotSl["+lotSl+"]");
System.out.println(" locCodeTo ["+locCodeTo+"] noArt["+noArt+"]");
/*if( noArt == 1)
/*if( noArt == 1)
{
continue;
}*/
......
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