Skip to content

B
business-java
Commit 9baad1a7 authored by ppatro's avatar ppatro
Browse files
Options

To merge src for WMS 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91934 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 45f0b8a5
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 9baad1a7
......@@ -437,7 +437,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
}
//Changed by Rohan on 06-09-12 to check previous task finish or not.end
*/
*/
// cpatil start on 11-sept-12
System.out.println("@@@@@ item validation in REPL_ORDER executed.......");
......@@ -666,6 +666,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
//lotSlNew = genericUtility.getColumnValue("lot_sl_new", allFormDataDom, "3" );
lotSlNew = genericUtility.getColumnValue("lot_sl__new", allFormDataDom, "3" );
replOrder = checkNull(genericUtility.getColumnValue("repl_order", allFormDataDom, "3" ));
lpnNo = genericUtility.getColumnValue("lot_sl", allFormDataDom, "3" );
//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
if(!lotSlNew.startsWith("NJ") && !lotSlNew.startsWith("CN") && !lotSlNew.startsWith("DM") && !lotSlNew.startsWith("EX") )
......@@ -711,7 +712,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
{
errList.add( "LPNORDTYPE" );
errFields.add( childNodeName.toLowerCase() );
}
}
else if((lotSlNew.trim().equalsIgnoreCase(lpnNo) || isLpnExist(lotSlNew ,conn)) && "A".equalsIgnoreCase(orderType) )
{
errList.add( "DUPLPNNO" );
errFields.add( childNodeName.toLowerCase() );
}
}
//Commented By mahesh Patidar on 01/08/12
......@@ -3299,6 +3305,64 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
System.out.println("defaultSite = ["+defaultSite+"]");
return defaultSite;
}
private boolean isLpnExist( String lpnNo, Connection connObject ) throws ITMException
{
String sql = "";
boolean isLpnExist = false;
PreparedStatement pstmt = null;
ResultSet rs = null;
int count = 0;
try
{
GenericUtility genericUtility = GenericUtility.getInstance();
sql = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE LOT_SL = ? ";
pstmt = connObject.prepareStatement( sql );
pstmt.setString( 1, lpnNo );
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt(1);
}
if ( count > 0 )
{
return isLpnExist = true;
}
rs.close();rs = null;
pstmt.close();pstmt = null;
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if ( rs != null )
{
rs.close();
rs = null;
}
if ( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
catch (Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
}
return isLpnExist;
}
private String addSelectedRecToDom( Document allFormDataDom, String detailString ) throws Exception
{
ArrayList selectedList = new ArrayList();
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 9baad1a7
......@@ -11166,7 +11166,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
lastPackVolume = lastPackVolume + remainingVolume;
double reqVolumeToStore = currentvolumeActive - remainingVolume;
double remain_quantity = reqVolumeToStore/perItemVolume;
double remain_quantity = Math.floor(reqVolumeToStore/perItemVolume);
activeTempPickList = new ArrayList();
HashMap activeTempMap1 = (HashMap)dataMap.clone();
activeTempMap1.put("no_art", "1");
......@@ -11226,6 +11226,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
totQtyPerPallet =(volumeRmaining/perItemVolume);
System.out.println("After calculating>>>> ["+totQtyPerPallet+"]");
totQtyPerPallet =Math.floor(volumeRmaining/perItemVolume);
System.out.println("To be check after Floor>>>> ["+totQtyPerPallet+"]");
}
//Changed by Rohan on 24-11-11 [WMIESUN006] For bug Fixing.start
......@@ -12405,7 +12407,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"E");
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
isReplHdr = true;
replOrdCpy = replRefDeepId;
......@@ -12431,9 +12433,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCnt);
pstmtRplDet.setString(12,replRefDeepId);
pstmtRplDet.setString(12,"");
replCnt++;
pstmtRplDet.setInt(13,replCnt);
pstmtRplDet.setInt(13,0);
if(locInvStat.equalsIgnoreCase(invDeepReserve))
{
......@@ -12809,7 +12811,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-ACT","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"E");
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
isReplHdr = true;
replOrdCpy = replRefDeepId;
......@@ -12823,9 +12825,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCnt);
pstmtRplDet.setString(12,replRefDeepId);
pstmtRplDet.setString(12,"");
replCnt++;
pstmtRplDet.setInt(13,replCnt);
pstmtRplDet.setInt(13,0);
if(locInvStat.equalsIgnoreCase(partialResrvLoc))
{
......@@ -12911,7 +12913,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDet.setString(1,pickRefId);
pstmtDet.setInt(2,pickCtr);
if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve) || locInvStat.equalsIgnoreCase(casePickInv))
if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve) || locInvStat.equalsIgnoreCase(casePickInv) || locInvStat.equalsIgnoreCase(partialResrvLoc))
{
pstmtDet.setString(7,actPkDeepLoc);
}
......
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