Skip to content

B
business-java
Commit 969692be authored by dpawar's avatar dpawar
Browse files
Options

Pragyan sir given for merge 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98172 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 121724b4
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 33 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 969692be
......@@ -96,7 +96,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
locCodeTo = genericUtility.getColumnValue("loc_code__to", dom, "2" );
System.out.println("palert no from generic utility ["+palletNo+"] locCodeTo [" + locCodeTo + "]");
//conn.setAutoCommit(false);
sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE "
+ " HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND HDR.PICK_TYPE IN ('A','M')"
+ " AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, palletNo);
pstmt.setString( 2, "N");
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssConf.java
View file @ 969692be
......@@ -347,7 +347,7 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
if("V".equalsIgnoreCase(orderType))
{
actualQty = quantity;
actualQty = 0.0;
}
else
{
......@@ -359,21 +359,23 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
System.out.println("Pick Quantity:="+pickQty);
System.out.println("Actual Quantity:="+actualQty);
System.out.println("Actual Allocate Quantity:="+actualAllocQty);
}
//Changed by Dadaso pawar on 26/06/15 [End]
if(actualAllocQty != 0.0 && pickQty < actualAllocQty)
{
System.out.println("Found Last case Found with Other allocation pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]");
isLastCaseUpDFlag = true;
lastCaseUpdQty = actualQty;
//actualQty = 0.0;
actualQty = quantity - actualAllocQty;
System.out.println("Now Actual Quantity to issue ["+actualQty+"]");
//Changed by Dadaso pawar on 26/06/15 [End]
if(actualAllocQty != 0.0 && pickQty < actualAllocQty)
{
System.out.println("Found Last case Found with Other allocation pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]");
isLastCaseUpDFlag = true;
lastCaseUpdQty = actualQty;
//actualQty = 0.0;
actualQty = quantity - actualAllocQty;
System.out.println("Now Actual Quantity to issue ["+actualQty+"]");
}
//Changed By Pragyan 03-May-14 for changed Last case logic if pick quantity > last case.end
}
//Changed By Pragyan 03-May-14 for changed Last case logic if pick quantity > last case.end
}
else
{
......@@ -381,7 +383,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
actualQty = quantity - actualAllocQty;
}
//Chnaged by Rohan on 15-02-13 for calculating actual qty from repanishment in case of stock to dock
}
}
System.out.println("Now pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]actualQty["+actualQty+"");
// end 09/02/13 manoharan actual quantity (balance quantity) is updated in multiples of number of cases so this has to be taken as the total pick quantity
String dExpLev = checkNullAndTrim(rs.getString( "EXP_LEV" ));
......@@ -641,10 +644,17 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+ " UNION ALL"
+ " SELECT * FROM PICK_ORD_DET WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ("
+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN (("
+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET WHERE PICK_ORDER =? AND LINE_NO__PICK = ? )))) "
+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' AND "
+ " (QUANTITY -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
pstmtPick = conn.prepareStatement(sql);
pstmtPick.setString(1, replOrder);
......@@ -654,6 +664,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
pstmtPick.setInt(4, replOrderLineNo);
pstmtPick.setString(5, replOrder);
pstmtPick.setInt(6, replOrderLineNo);
pstmtPick.setString(7, replOrder);
pstmtPick.setInt(8, replOrderLineNo);
//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
rsPick = pstmtPick.executeQuery();
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 969692be
......@@ -674,7 +674,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
pstmt.close();
pstmt = null;
sql = " SELECT R.REPL_ORDER FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT WHERE " +
//sql = " SELECT R.REPL_ORDER FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT WHERE " +
sql = " SELECT R.REPL_ORDER,R.ORDER_TYPE FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT WHERE " +
" R.REPL_ORDER = WD.REF_ID AND R.REPL_ORDER = RT.REPL_ORDER AND R.WAVE_ID = W.WAVE_ID AND W.WAVE_ID = WD.WAVE_ID " +
" AND WD.STATUS ='N' AND W.CANCEL = 'N' AND ( RT.CANCEL_MODE='N' OR RT.CANCEL_MODE IS NULL ) " +
" AND RT.SITE_CODE = ? AND RT.ITEM_CODE = ? AND RT.LOC_CODE = ? AND RT.LOT_NO = ? AND RT.LOT_SL = ? " +
......@@ -689,10 +690,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
if( rs.next() )
{
replOrd = checkNull(rs.getString("REPL_ORDER"));
orderType = checkNull(rs.getString("ORDER_TYPE"));
System.out.println("replOrd-->"+replOrd);
System.out.println("headerreplOrder-->"+replOrder);
if( !replOrder.trim().equalsIgnoreCase( replOrd ) )
System.out.println("orderType-->"+orderType);
//if( !replOrder.trim().equalsIgnoreCase( replOrd ) )
if( !replOrder.trim().equalsIgnoreCase( replOrd ) && !"U".equalsIgnoreCase(orderType))
{
errList.add( "VTREPLORDR" );
errFields.add( childNodeName.toLowerCase() );
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 969692be
......@@ -6653,8 +6653,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String remarks = "";
//chnaged by pragyan on 15/10/14 for cold chain
String locTypeParent = "";
// Changes by Dadaso pawar on 17/03/15 [Start]
String consoliRepl = "";
//Changes by Dadaso pawar on 17/03/15 [Start]
//String consoliRepl = "";
//Changes by Dadaso pawar on 17/03/15 [End]
try
......@@ -6688,10 +6688,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom));
System.out.println("wavetaskinsert::::::::"+remarks);
//Changes by Dadaso pawar on 17/03/15 [Start]
/*//Changes by Dadaso pawar on 17/03/15 [Start]
consoliRepl = checkNull(genericUtility.getColumnValue("consolidate_repl",headerDom));
consoliRepl = consoliRepl.trim();
System.out.println("consoliRepl::::::::["+consoliRepl+"]");
System.out.println("consoliRepl::::::::["+consoliRepl+"]"); */
//Changes by Dadaso pawar on 17/03/15 [End]
/*
if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
......@@ -6724,7 +6724,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " +
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changes by Dadaso pawar on 17/03/15 [Start]
",CONSOLIDATE_REPL "+
//",CONSOLIDATE_REPL "+
//Changes by Dadaso pawar on 17/03/15 [End]
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
......@@ -6733,7 +6733,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?)";
") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by Rohan on 1-12-11 on [WM1ESUN006] to add ptcn into wave_task.end
pstmt = conn.prepareStatement(insertSql);
pstmt.setString(1,waveId);
......@@ -6760,9 +6760,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt.setString(17,locTypeParentInput);
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
pstmt.setString(18,batchID);
//Changed by Dadaso pawar on 17/03/15 [Start]
pstmt.setString(19,consoliRepl);
//Changed by Dadaso pawar on 17/03/15 [End]
//Changes by Dadaso pawar on 17/03/15 [Start]
// pstmt.setString(19,consoliRepl);
//Changes by Dadaso pawar on 17/03/15 [End]
pstmt.executeUpdate();
System.out.println("Start Wave Genartion.......................");
......@@ -10765,6 +10765,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}*/
if(isConsolidatedRepl)
{
if(!isReplCpkISTG)
{
replConRefId = updateWaveTaskDet(waveID,1,saleOrder,"C-STG","N",ptcn,conn);
pstmtRplHdr.setString(1,replConRefId);
pstmtRplHdr.setDate(2,orderDate);
pstmtRplHdr.setString(3, siteCode);
pstmtRplHdr.setString(4,saleOrder);
pstmtRplHdr.setString(5,waveID);
pstmtRplHdr.setString(6,chgUser);
pstmtRplHdr.setString(7,chgTerm);
pstmtRplHdr.setDate(8,orderDate);
pstmtRplHdr.setString(9,"U");
pstmtRplHdr.executeUpdate();
pstmtRplHdr.clearParameters();
isReplCpkISTG = true;
replOrdCpkISTG = replConRefId;
}
else
{
rplCntCpkISTG++;
replConRefId = replOrdCpkISTG;
}
pstmtRplDet.setString(1,replConRefId);
pstmtRplDet.setInt(2,rplCntCpkISTG);
pstmtRplDet.setString(3,saleOrder);
......@@ -11354,6 +11377,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}*/
if(isConsolidatedRepl)
{
if(!isReplCpkISTG)
{
replConRefId = updateWaveTaskDet(waveID,1,saleOrder,"C-STG","N",ptcn,conn);
pstmtRplHdr.setString(1,replConRefId);
pstmtRplHdr.setDate(2,orderDate);
pstmtRplHdr.setString(3, siteCode);
pstmtRplHdr.setString(4,saleOrder);
pstmtRplHdr.setString(5,waveID);
pstmtRplHdr.setString(6,chgUser);
pstmtRplHdr.setString(7,chgTerm);
pstmtRplHdr.setDate(8,orderDate);
pstmtRplHdr.setString(9,"U");
pstmtRplHdr.executeUpdate();
pstmtRplHdr.clearParameters();
isReplCpkISTG = true;
replOrdCpkISTG = replConRefId;
}
else
{
rplCntCpkISTG++;
replConRefId = replOrdCpkISTG;
}
pstmtRplDet.setString(1,replConRefId);
pstmtRplDet.setInt(2,rplCntCpkISTG);
pstmtRplDet.setString(3,saleOrder);
......@@ -12405,11 +12451,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
tempCaseReplList = getActiveCaseReplMap("X",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
}
//Changes by Dadaso pawar on 11/02/15 [Start] Resolved Multiple active Repl. from same case pick location.
if(tempReplList.size() == 0 && tempCaseReplList.size() == 0)
//Changes by Dadaso pawar on 11/02/15 [Start] Resolved Multiple active Repl. from same case pick location.
//Commented Need to impact further.
/* if(tempReplList.size() == 0 && tempCaseReplList.size() == 0)
{
tempReplList = getActiveCaseReplMap("Q",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
}
}*/
//Changes by Dadaso pawar on 11/02/15 [End] Resolved Multiple active Repl. from same case pick location.
}
if(tempReplList.size() > 0)
......@@ -12708,6 +12755,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(12,acPrvReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(acPrvLineNo));
pstmtRplDet.setDouble(11, casePackSize);//RO
pstmtRplDet.setString(15,locCodeCaseAct);
pstmtRplDet.executeUpdate();
//Changed by Rohan 26/08/12 to add pick.start
......@@ -12910,6 +12958,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//pstmtRplDet.setString(12,cPReplOrder);
pstmtRplDet.setString(12,cReplOrder);
pstmtRplDet.setInt(13,Integer.parseInt(cReplOrderLine));
pstmtRplDet.setDouble(11, casePackSize);//RO
pstmtRplDet.setString(15,actPkDeepLoc);
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
......@@ -13161,6 +13210,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(pndLoc != null && pndLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,pndLoc);
}
else
......@@ -13177,6 +13227,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -13222,6 +13273,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pndLocationset.add(pndLoc);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -13603,7 +13655,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//Changed by Pragyan 10/Mar/15 D14ISUN007 Consolidated Replenishment.end
pstmtDet.setDouble(10,Double.parseDouble(noArt));
//pstmtDet.setDouble(11,avilableCaseActQty);
pstmtDet.setDouble(11,avilableCaseActQty);
//Changed by Pragyan 10/Mar/15 D14ISUN007 Consolidated Replenishment.start
/*pstmtDet.setString(14,sReplOrder);
//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header
......@@ -13672,6 +13724,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -14039,6 +14092,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pndLoc = getAvilablePickLocation("N", conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(pndLoc != null && pndLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
//Changed by Rohan on 04-07-13 for split active replanishment task based on configuration of disparam.
pstmtRplDet.setString(15,pndLoc);
}
......@@ -14056,6 +14110,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -14105,6 +14160,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -14344,6 +14400,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -14608,6 +14665,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(pndLoc != null && pndLoc.length() > 0)
{
//Changed by Rohan on 04-07-13 for split active replanishment task based on configuration of disparam.
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,pndLoc);
}
else
......@@ -14624,6 +14682,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
actPkDeepLoc = getAvilablePickLocation(pickType, conn, itemLocType,locZonePref,locCode,itemCode,siteCode,lotNo,lotSl);
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......@@ -14673,6 +14732,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(actPkDeepLoc != null && actPkDeepLoc.length() > 0)
{
pstmtRplDet.setDouble(11, casePackSize);
pstmtRplDet.setString(15,actPkDeepLoc);
}
else
......
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