Skip to content

B
business-java
Commit 9b45ea16 authored by jshinde's avatar jshinde
Browse files
Options

Request id:[W15LKAT005] bug fixing & Picking issue line number generation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101038 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 747291cb
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 23 deletions
webitm-wms/ibase/webitm/ejb/wms/PickIssIC.java
View file @ 9b45ea16
......@@ -365,7 +365,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
rs = null;
}
//Changed by wasim on 14-03-2016 to close prepared statement/ Result set [END]
}
//Changed by sumit on 28/09/12 validating in case of wave canceled end.
// cpatil end
......@@ -863,7 +863,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
ptcn = checkNull(genericUtility.getColumnValue( "ptcn", currFormDataDom ));
pickOrder = checkNull(genericUtility.getColumnValue( "pick_order", currFormDataDom ));
//Changed by MANISH on 14/03/16 [Start]
sql = " SELECT COUNT(*) FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'C' AND REF_ID =? AND PTCN = ?";
pstmt = conn.prepareStatement( sql );
......@@ -883,7 +883,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
errFields.add( childNodeName.toLowerCase() );
}
//Changed by MANISH on 14/03/16 [END]
//Changed by Dadaso pawar on 13/05/15 [Start]
//If sale order on hold then show error message.
sql = "SELECT SALE_ORDER FROM WAVE_TASK_DET WHERE PTCN = ? AND REF_ID = ?";
......@@ -943,7 +943,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
pstmt.close(); pstmt = null;
//Changed by sumit on 04/04/13 adding validation , user can asign same pallet_no to other pick of same ptcn start.
// sql = "SELECT DISTINCT PTCN FROM WAVE_TASK_DET WHERE REF_ID IN (SELECT DISTINCT PICK_ORDER FROM PICK_ISS_HDR WHERE PTCN = ?)";
// sql = "SELECT DISTINCT PTCN FROM WAVE_TASK_DET WHERE REF_ID IN (SELECT DISTINCT PICK_ORDER FROM PICK_ISS_HDR WHERE PTCN = ?)";
sql = "SELECT DISTINCT PTCN FROM PICK_ISS_HDR WHERE PICK_ORDER IN (SELECT DISTINCT REF_ID FROM WAVE_TASK_DET WHERE PTCN = ?)"; //Changed by MANISH on 14/03/16 [Start]
pstmt = conn.prepareStatement( sql );
pstmt.setString(1, ptcn);
......@@ -1328,8 +1328,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
//Changes by Manish on 28/12/15 for DDUK [end]
else
{
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
}
pickOrder = checkNull(genericUtility.getColumnValue("pick_order", allFormDataDom, objContext ));
......@@ -1801,8 +1801,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lotSl = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lotSl = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
}
//Changes by Manish on 28/12/15 for DDUK [end]
sql = " select count (*) from stock "
......@@ -1847,8 +1847,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
lotNo = checkNull(genericUtility.getColumnValue("lot_no", allFormDataDom, objContext ));
lpnNo = checkNull(genericUtility.getColumnValue("lot_sl", allFormDataDom, objContext ));
}
pickOrder = checkNull(genericUtility.getColumnValue("pick_order", allFormDataDom, objContext ));
......@@ -3705,7 +3705,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
pstmt.close(); pstmt = null;
System.out.println("pickIssMap = ::"+pickIssMap);
sql = "SELECT MAX(LINE_NO) FROM PICK_ISS_DET WHERE TRAN_ID = ?";
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[start]
/*sql = "SELECT MAX(LINE_NO) FROM PICK_ISS_DET WHERE TRAN_ID = ?";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, tranID );
......@@ -3717,7 +3718,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
//locCodeTo = rs.getString("LOC_CODE__TO");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
pstmt.close(); pstmt = null;*/
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[End]
}
......@@ -3851,8 +3853,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNullAndTrim(rsIss.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsIss.getString("LOT_SL"));
lotNo = checkNullAndTrim(rsIss.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsIss.getString("LOT_SL"));
}
locCode = checkNullAndTrim(rsIss.getString("LOC_CODE"));
caseLabel = checkNull(rsIss.getString("CASE_LABEL"));
......@@ -3986,7 +3988,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
}
itmVolumeMap.clear();
itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
......@@ -4052,8 +4054,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsOrd.getString("LOT_SL"));
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsOrd.getString("LOT_SL"));
}
//changed by gulzar on 21/12/11
if ( qtyPerArt == 0 )
......@@ -4072,12 +4074,18 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
pstmtStock.clearParameters();
}
//End changes by gulzar on 21/12/11
valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[start]
//valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail3 domID='"+ lineNoOrd +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[End]
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); //added by Kunal on 14/08/12
//valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<tran_id><![CDATA[" ).append( tranID ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[start]
//valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no>\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[End]
valueXmlString.append( "<pick_order><![CDATA[" ).append( pickOrder ).append( "]]></pick_order>\r\n" );
valueXmlString.append( "<line_no__ord><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no__ord>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_code>\r\n" );
......@@ -4130,15 +4138,21 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
}
else
{
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsOrd.getString("LOT_SL"));
lotNo = checkNullAndTrim(rsOrd.getString("LOT_NO"));
lpnNo = checkNullAndTrim(rsOrd.getString("LOT_SL"));
}
valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[start]
//valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<Detail3 domID='"+ lineNoOrd +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[End]
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); //added by Kunal on 14/08/12
//valueXmlString.append( "<Detail3 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"N\">\r\n" );
valueXmlString.append( "<tran_id><![CDATA[" ).append( tranID ).append( "]]></tran_id>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[start]
//valueXmlString.append( "<line_no><![CDATA[" ).append( domID ).append( "]]></line_no>\r\n" );
valueXmlString.append( "<line_no><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no>\r\n" );
//Changed by Jagruti Shinde for Bug fixing and picking issue line number generation.[End]
valueXmlString.append( "<pick_order><![CDATA[" ).append( pickOrder ).append( "]]></pick_order>\r\n" );
valueXmlString.append( "<line_no__ord><![CDATA[" ).append( lineNoOrd ).append( "]]></line_no__ord>\r\n" );
valueXmlString.append( "<item_code><![CDATA[" ).append( itemCode ).append( "]]></item_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