Skip to content

B
business-java
Commit 91f0549f authored by ppatro's avatar ppatro
Browse files
Options

issue tracker 295 & 297 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93802 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b70f4ed2
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 57 deletions
webitm-wms/ibase/webitm/ejb/wms/PickIssIC.java
View file @ 91f0549f
...@@ -1015,58 +1015,66 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -1015,58 +1015,66 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]"); System.out.println(" columnName [" + childNodeName + "] columnValue [" + columnValue + "]");
if( "lot_no".equalsIgnoreCase( childNodeName ) ) if( "lot_no".equalsIgnoreCase( childNodeName ) )
{ {
pickOrder = genericUtility.getColumnValue("pick_order", allFormDataDom, objContext ); pickOrder = genericUtility.getColumnValue("pick_order", allFormDataDom, objContext );
lineNoPick = genericUtility.getColumnValue("line_no__ord", allFormDataDom, objContext ); lineNoPick = checkNull(genericUtility.getColumnValue("line_no__ord", allFormDataDom, objContext ));
lotNo = genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ); if(lineNoPick != null && lineNoPick.length() > 0)
pstmtPickLotNo.setString( 1, pickOrder );
pstmtPickLotNo.setInt( 2, Integer.parseInt(lineNoPick) );
pstmtPickLotNo.setString( 3, lotNo );
rs = pstmtPickLotNo.executeQuery();
if( rs.next() )
{ {
count = rs.getInt("COUNT"); lotNo = genericUtility.getColumnValue("lot_no", allFormDataDom, objContext );
}
pstmtPickLotNo.clearParameters(); pstmtPickLotNo.setString( 1, pickOrder );
if ( count == 0 ) pstmtPickLotNo.setInt( 2, Integer.parseInt(lineNoPick) );
{ pstmtPickLotNo.setString( 3, lotNo );
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "lot_no", "INVLOTNO", userId ); rs = pstmtPickLotNo.executeQuery();
//break; if( rs.next() )
errList.add( "INVLOTNO" ); {
errFields.add( childNodeName.toLowerCase() ); count = rs.getInt("COUNT");
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed }
pstmtPickLotNo.clearParameters();
if ( count == 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "lot_no", "INVLOTNO", userId );
//break;
errList.add( "INVLOTNO" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
rs.close(); rs = null;
} }
rs.close(); rs = null;
} }
else if( "lot_sl".equalsIgnoreCase( childNodeName ) ) else if( "lot_sl".equalsIgnoreCase( childNodeName ) )
{ {
pickOrder = genericUtility.getColumnValue("pick_order", allFormDataDom, objContext ); pickOrder = genericUtility.getColumnValue("pick_order", allFormDataDom, objContext );
lineNoPick = genericUtility.getColumnValue("line_no__ord", allFormDataDom, objContext ); lineNoPick = checkNull(genericUtility.getColumnValue("line_no__ord", allFormDataDom, objContext ));
lpnNo = genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ); lpnNo = genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext );
pstmtPickLotSl.setString( 1, pickOrder );
pstmtPickLotSl.setInt( 2, Integer.parseInt(lineNoPick) ); if(lineNoPick != null && lineNoPick.length() > 0)
pstmtPickLotSl.setString( 3, lpnNo );
rs = pstmtPickLotSl.executeQuery();
if( rs.next() )
{
count = rs.getInt("COUNT");
}
pstmtPickLotSl.clearParameters();
if ( count == 0 )
{ {
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed pstmtPickLotSl.setString( 1, pickOrder );
//errString = getErrorString( "lot_no", "INVLPNNO", userId ); pstmtPickLotSl.setInt( 2, Integer.parseInt(lineNoPick) );
//break; pstmtPickLotSl.setString( 3, lpnNo );
errList.add( "INVLPNNO" );
errFields.add( childNodeName.toLowerCase() ); rs = pstmtPickLotSl.executeQuery();
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed if( rs.next() )
{
count = rs.getInt("COUNT");
}
pstmtPickLotSl.clearParameters();
if ( count == 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
//errString = getErrorString( "lot_no", "INVLPNNO", userId );
//break;
errList.add( "INVLPNNO" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
rs.close(); rs = null;
} }
rs.close(); rs = null;
////////////////////////////////////////////// //////////////////////////////////////////////
// 14/09/12 manoharan validate hold status // 14/09/12 manoharan validate hold status
itemCode = checkNull(genericUtility.getColumnValue("item_code", allFormDataDom, objContext )); itemCode = checkNull(genericUtility.getColumnValue("item_code", allFormDataDom, objContext ));
...@@ -1765,6 +1773,10 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -1765,6 +1773,10 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
else if("pick_order".equalsIgnoreCase( childNodeName )) else if("pick_order".equalsIgnoreCase( childNodeName ))
{ {
tranID = genericUtility.getColumnValue("tran_id", currFormDataDom, objContext );
String palletNo = genericUtility.getColumnValue("pallet_no", hdrDataDom, "1" );
System.out.println("DATA FOUND IN PICKING TRAN_ID ["+tranID+"]["+palletNo+"]");
pickOrdIss = checkNull(genericUtility.getColumnValue( "pick_order", currFormDataDom, objContext )); pickOrdIss = checkNull(genericUtility.getColumnValue( "pick_order", currFormDataDom, objContext ));
linNoOrder = genericUtility.getColumnValue("line_no__ord", currFormDataDom, objContext ); linNoOrder = genericUtility.getColumnValue("line_no__ord", currFormDataDom, objContext );
...@@ -1808,19 +1820,22 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -1808,19 +1820,22 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
pstmt = null; pstmt = null;
String comleteStatus = ""; String comleteStatus = "";
sql = "SELECT STATUS FROM PICK_ORD_HDR WHERE PICK_ORDER = ?"; //sql = "SELECT STATUS FROM PICK_ORD_HDR WHERE PICK_ORDER = ?";
sql = "SELECT CONFIRMED FROM PICK_ISS_HDR WHERE TRAN_ID = ? AND PALLET_NO = ?";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, pickOrdIss ); pstmt.setString( 1, tranID );
pstmt.setString( 2, palletNo );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if( rs.next() ) if( rs.next() )
{ {
comleteStatus = rs.getString("STATUS"); comleteStatus = rs.getString("CONFIRMED");
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
System.out.println("Current Pick Status ["+comleteStatus+"]["+pickOrdIss+"]"); System.out.println("Current Pick Status ["+comleteStatus+"]["+pickOrdIss+"]");
if("C".equalsIgnoreCase(comleteStatus)) if("Y".equalsIgnoreCase(comleteStatus))
{ {
errList.add( "VTPICKCOMP" ); errList.add( "VTPICKCOMP" );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
...@@ -2714,8 +2729,31 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -2714,8 +2729,31 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
//transMode = checkNull(genericUtility.getColumnValue( "trans_mode", hdrDataDom )); //transMode = checkNull(genericUtility.getColumnValue( "trans_mode", hdrDataDom ));
tranID = checkNull(genericUtility.getColumnValue("tran_id", allFormDataDom, "2")); tranID = checkNull(genericUtility.getColumnValue("tran_id", allFormDataDom, "2"));
pickType = checkNull(genericUtility.getColumnValue("pick_type", allFormDataDom, "2")); pickType = checkNull(genericUtility.getColumnValue("pick_type", allFormDataDom, "2"));
palletNo = checkNull(genericUtility.getColumnValue("pallet_no", allFormDataDom, "2"));
String quantity2 = checkNull(genericUtility.getColumnValue("quantity", allFormDataDom, "3")); String quantity2 = checkNull(genericUtility.getColumnValue("quantity", allFormDataDom, "3"));
System.out.println("@@@@@@@ quantity : "+quantity2); System.out.println("@@@@@@@ quantity : "+quantity2);
if(tranID != null && tranID.length() == 0)
{
sql = "SELECT TRAN_ID FROM PICK_ISS_HDR WHERE PICK_ORDER = ? AND PALLET_NO = ?" ;
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, pickOrder );
pstmt.setString( 2, palletNo );
rs = pstmt.executeQuery();
if( rs.next() )
{
tranID = rs.getString("TRAN_ID");
System.out.println("YES I GOT THE TRAN_ID ["+tranID+"]");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
//changes made by deepak - 25/11/11 //changes made by deepak - 25/11/11
pickLocList = new ArrayList(); pickLocList = new ArrayList();
if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick
...@@ -3229,8 +3267,15 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -3229,8 +3267,15 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
//valueXmlString.append( "<loc_code__to protect = '1'><![CDATA[" ).append( locCodeTo ).append( "]]></loc_code__to>\r\n" ); //valueXmlString.append( "<loc_code__to protect = '1'><![CDATA[" ).append( locCodeTo ).append( "]]></loc_code__to>\r\n" );
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
//pstmtIss.clearParameters(); //pstmtIss.clearParameters();
} }
//Changed By Pragyan.start AN
System.out.println("UPDATING THE TRAN ID FOR DETAIL2 AS IT IS NOT PRESENT["+tranID+"]");
valueXmlString.append("<Detail2>\r\n");
valueXmlString.append( "<tran_id><![CDATA[" ).append( checkNull( tranID )).append( "]]></tran_id>\r\n" );
valueXmlString.append("</Detail2>\r\n");
//Changed By Pragyan.end
rsOrd.close(); rsOrd = null; rsOrd.close(); rsOrd = null;
pstmtOrd.close(); pstmtOrd = null; pstmtOrd.close(); pstmtOrd = null;
//pstmtIss.close(); pstmtIss = null; //pstmtIss.close(); pstmtIss = null;
...@@ -3652,24 +3697,45 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC ...@@ -3652,24 +3697,45 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
System.out.println("nodeName =["+nodeName+"]"); System.out.println("nodeName =["+nodeName+"]");
if (nodeName.equalsIgnoreCase("case_label")) if (nodeName.equalsIgnoreCase("case_label"))
{ {
//System.out.println("caseLabelNode =["+genericUtility.serializeDom( caseLabelNode )+"]"); if(caseLabelNode != null)
updatedNode = detailDom.importNode(caseLabelNode, true); {
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]"); //System.out.println("caseLabelNode =["+genericUtility.serializeDom( caseLabelNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName ); updatedNode = detailDom.importNode(caseLabelNode, true);
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName );
}
else
{
System.out.println("On Next Previous case label node null");
}
} }
else if ( nodeName.equalsIgnoreCase("loc_code__to") ) else if ( nodeName.equalsIgnoreCase("loc_code__to") )
{ {
//System.out.println("LocCodeToNode =["+genericUtility.serializeDom( LocCodeToNode )+"]"); if(locCodeToNode != null)
updatedNode = detailDom.importNode(locCodeToNode, true); {
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]"); //System.out.println("LocCodeToNode =["+genericUtility.serializeDom( LocCodeToNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName ); updatedNode = detailDom.importNode(locCodeToNode, true);
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName );
}
else
{
System.out.println("On Next Previous location code null");
}
} }
else if ( nodeName.equalsIgnoreCase("carton_no") ) else if ( nodeName.equalsIgnoreCase("carton_no") )
{ {
//System.out.println("cartonNoNode =["+genericUtility.serializeDom( cartonNoNode )+"]"); if(cartonNoNode != null)
updatedNode = detailDom.importNode(cartonNoNode, true); {
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]"); //System.out.println("cartonNoNode =["+genericUtility.serializeDom( cartonNoNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName ); updatedNode = detailDom.importNode(cartonNoNode, true);
//System.out.println("updatedNode =["+genericUtility.serializeDom( updatedNode )+"]");
(detailDom.getElementsByTagName("Detail3").item(ctr)).replaceChild(updatedNode, elementName );
}
else
{
System.out.println("On Next Previous cartonNoNode code null");
}
} }
}//inner for loop }//inner for loop
}//if ( toUpdateMap.containsKey(domIDVal) ) }//if ( toUpdateMap.containsKey(domIDVal) )
......
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