Skip to content

B
business-java
Commit 7393d6c5 authored by vhegde's avatar vhegde
Browse files
Options

changed by sankara on 15/03/14 updated wavegenerationprc given by pragyan 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94383 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d50d0559
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 58 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 7393d6c5
......@@ -305,7 +305,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ResultSet rs2 = null,rsMan = null,rsHld = null,rsM = null;
//changed by sankara on 04/02/14 getting order type
String saleOrdertype = "";
retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
"<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
try
......@@ -10038,8 +10038,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
if("Y".equalsIgnoreCase(isRepl))
{
updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
//^^^^^^^
////updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCtr);
......@@ -10414,7 +10414,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("Y".equalsIgnoreCase(isRepl))
{
updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
//^^^^^^^^^^^^
///updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCtr);
pstmtRplDet.setString(3,saleOrder);
......@@ -11467,6 +11468,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("pendActQty"+pendActQty);
if(pendActQty > 0)
{
if(activePickInv.equalsIgnoreCase(getInventoryStatus(locCodeCase, conn)))
{
errString = getError(saleOrder+":"+lotNo+":"+lotSl+":"+locCodeCase,"VTREPLFRMA",conn);
return errString;
}
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","E",ptcn,conn);
......@@ -11553,47 +11561,57 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
else
{
System.out.println("Inside tempReplList.. Block quantity avilable in suggested case pick Location...");
//pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
if(!isReplHdr)
//Changed By Pragyan 14-MAR-14 to check a validation if replenishment is from active location.start
if(!locInvStat.equalsIgnoreCase(activePickInv) && !(directPickLoc != null && directPickLoc.length() > 0))
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
isReplHdr = true;
replOrdCpy = replRefDeepId;
}
else
{
replRefDeepId = replOrdCpy ;
replCnt++;
if(activePickInv.equalsIgnoreCase(getInventoryStatus(locCodeCase, conn)))
{
errString = getError(saleOrder+":"+lotNo+":"+lotSl+":"+locCodeCase,"VTREPLFRMA",conn);
return errString;
}
//pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"A-PICK","A",ptcn,conn);
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","E",ptcn,conn);
pstmtRplHdr.setString(1,replRefDeepId);
pstmtRplHdr.setString(9,"Q");
pstmtRplHdr.executeUpdate();
isReplHdr = true;
replOrdCpy = replRefDeepId;
}
else
{
replRefDeepId = replOrdCpy ;
replCnt++;
}
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCnt);
pstmtRplDet.setString(7,locCodeCase);
//Changed by Rohan on 04-07-13 for split active replanishment task based on configuration of disparam
caspkLocationset.add(locCodeCase);
pstmtRplDet.setDouble(11, casePackSize);
//pstmtRplDet.setString(12,cPReplOrder);
pstmtRplDet.setString(12,cReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(cReplOrderLine));
pstmtRplDet.setString(15,actPkDeepLoc);
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
{
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVAPKLOC",conn);
return errString;
}
pstmtRplDet.executeUpdate();
}
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCnt);
pstmtRplDet.setString(7,locCodeCase);
//Changed by Rohan on 04-07-13 for split active replanishment task based on configuration of disparam
caspkLocationset.add(locCodeCase);
pstmtRplDet.setDouble(11, casePackSize);
//pstmtRplDet.setString(12,cPReplOrder);
pstmtRplDet.setString(12,cReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(cReplOrderLine));
pstmtRplDet.setString(15,actPkDeepLoc);
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
{
pstmtRplDet.setString(15,"");
errString = getError(saleOrder,"INVAPKLOC",conn);
return errString;
}
pstmtRplDet.executeUpdate();
if(!isActivePickHdr)
{
......@@ -12016,6 +12034,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
replCnt++;
}
if(activePickInv.equalsIgnoreCase(getInventoryStatus(locCodeCase, conn)))
{
errString = getError(saleOrder+":"+lotNo+":"+lotSl+":"+locCodeCase,"VTREPLFRMA",conn);
return errString;
}
pstmtRplDet.setString(1,replRefDeepId);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
......@@ -12123,6 +12147,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("tempCaseReplList..replenishment");
System.out.println("in replenishment block");
if(activePickInv.equalsIgnoreCase(getInventoryStatus(locCodeCase, conn)))
{
errString = getError(saleOrder+":"+lotNo+":"+lotSl+":"+locCodeCase,"VTREPLFRMA",conn);
return errString;
}
if(!isReplHdr)
{
replRefDeepId = updateWaveTaskDet(waveID,1,saleOrder,"R-CPA","C",ptcn,conn);
......@@ -18703,8 +18733,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
//Changed By Pragyan 24-feb-14 ^^^^^
//+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY,REPL_QTY AS REPL_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
//+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY,REPL_QTY AS REPL_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
+" AND D.ITEM_CODE = S.ITEM_CODE AND D.SITE_CODE = S.SITE_CODE "
//Changed by Rohan on 13-02-13 add partial reserv location in map.start
......@@ -18739,7 +18769,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actualQtyReplHis = rsReplHistory.getDouble("ACTUAL_QTY");
locCodeToHis = rsReplHistory.getString("LOC_CODE__TO");
//^^^^^
replQty = rsReplHistory.getDouble("REPL_QTY");
//replQty = rsReplHistory.getDouble("REPL_QTY");
System.out.println("locCodeToHis********"+locCodeToHis);
lineNoReplHis=rsReplHistory.getInt("LINE_NO");
//Changed by Rohan on 27/07/12 to move location form caspick location to DOCK location
......@@ -18907,7 +18937,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
tempHisMap.put("LINE_NO_PICK",lineNoPick);
System.out.println("Stock Quantity"+stkQty+"FOR locCodeRepl"+locCodeRepl);
//^^^^^^^
tempHisMap.put("REPL_QTY",replQty);
//tempHisMap.put("REPL_QTY",replQty);
tempHisList.add(tempHisMap);
System.out.println("tempHisList$$$$$"+tempHisList);
System.out.println("itemCodeHis"+itemCodeHis+"]siteCodeHis["+siteCodeHis+"]lotNoHis["+lotNoHis+"]lotSlHis["+lotSlHis+"]locCodeHis["+locCodeHis+"]locCodeRepl["+locCodeRepl);
......@@ -21226,22 +21256,43 @@ public int updateReplOrdDet(String replType,String itemCode,String siteCode,Stri
int updatedRecordCount = 0 ;
try
{
sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ?,REPL_TYPE = ? WHERE ITEM_CODE = ?" +
//" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ?" ;
" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?" ;
//"AND LOC_CODE__TO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, reqQuantity);
pstmt.setString(2, replType);
pstmt.setString(3, itemCode);
pstmt.setString(4, locCode);
pstmt.setString(5, siteCode);
pstmt.setString(6, lotNo);
pstmt.setString(7, lotSl);
pstmt.setString(8, replOrder);
pstmt.setInt(9, Integer.parseInt(replLineNo));
//Changed By Pragyan 15-MAR-14 not to update repl type blank.start
System.out.println("CURRENT REPL TYPE AND QUANTITY FOR UPDATING updateReplOrdDet()["+replType+"reqQuantity["+reqQuantity+"]");
if(replType != null && replType.length() > 0)
{
sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ?,REPL_TYPE = ? WHERE ITEM_CODE = ?" +
" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, reqQuantity);
pstmt.setString(2, replType);
pstmt.setString(3, itemCode);
pstmt.setString(4, locCode);
pstmt.setString(5, siteCode);
pstmt.setString(6, lotNo);
pstmt.setString(7, lotSl);
pstmt.setString(8, replOrder);
pstmt.setInt(9, Integer.parseInt(replLineNo));
}
else
{
sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ? WHERE ITEM_CODE = ?" +
" AND LOC_CODE = ? AND SITE_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND REPL_ORDER = ? AND LINE_NO = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, reqQuantity);
pstmt.setString(2, itemCode);
pstmt.setString(3, locCode);
pstmt.setString(4, siteCode);
pstmt.setString(5, lotNo);
pstmt.setString(6, lotSl);
pstmt.setString(7, replOrder);
pstmt.setInt(8, Integer.parseInt(replLineNo));
}
updatedRecordCount = pstmt.executeUpdate();
}
......@@ -22084,4 +22135,37 @@ public void updateStkReplQty(String locCode,String itemCode,String lotNo,String
}
}
//changed by Pragyan on 28/FEB/14 for update repl qty in stock.end
private String getInventoryStatus(String locCode,Connection conn) throws ITMException
{
String sql = "",invStat = "";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
sql = " SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCode);
rs = pstmt.executeQuery();
if( rs.next())
{
invStat = rs.getString(1);
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
return invStat;
}
}
\ No newline at end of file
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