Skip to content

B
business-java
Commit 42288e2c authored by wansari's avatar wansari
Browse files
Options

D14IKAT005 changed FOR wms PARAMETARIZATION. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98106 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 05385de9
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 58 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 42288e2c
......@@ -224,7 +224,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Pragyan 10/Mar/15 D14ISUN007 Consolidated Replenishment
boolean isConsolidatedRepl = false;
//Changed by Dadaso pawar on 05/06/15 [Start]
String projectName = "";
//Changed by Dadaso pawar on 05/06/15 [End]
public String process() throws RemoteException,ITMException
{
return "";
......@@ -528,7 +530,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM "
//chnaged by pragyan on 15/10/14 for cold chain
//+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT "
+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT,SORDER.TRAN_CODE "
+"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE,CUSTOMER C "
+"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
+"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
......@@ -602,6 +604,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
activePickLoc = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
deepStoreLoc = discommon.getDisparams("999999","DEEP_STORE_INVSTAT",conn);
partialResrvLoc = discommon.getDisparams("999999","PRSRV_INVSTAT",conn);
//Changes by Dadaso pawar on 04/06/15 [Start]
projectName = checkNull(discommon.getDisparams("999999","PROJECT",conn));
System.out.println("projectName-------->>["+projectName+"]");
//Changes by Dadaso pawar on 04/06/15 [End]
System.out.println("CASE_PICK_INVSTAT"+casePickLoc+"ACTIVE_PICK_INVSTAT"+activePickLoc+"RESERV_LOCATION"+resrvLoc+"PARTIAL RESERVE LOC["+partialResrvLoc+"]shipmentType["+shipType+"]");
......@@ -756,7 +763,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println(" first mbaseUnit ["+mbaseUnit+"] unit ["+unit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"]");
//chnaged by pragyan on 15/10/14 for cold chain
locTypeParent = rs.getString("LOC_TYPE__PARENT");
//Changed by Dadaso pawar on 04/06/15 [Start]
tranCod = checkNull(rs.getString("TRAN_CODE"));
if(unitStd != "")
{
mbaseUnit = unitStd;
......@@ -846,64 +854,66 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
pickType = "P";
}
//Changed By Pragyan 14/08/14 for tran code and loc type parent start.
if(tranCodeInput == null || tranCodeInput.trim().length() <= 0)
//Changed by Dadaso pawar 04/06/15 [Start] (Add condition for DDUK project)
if(! "DDUK".equalsIgnoreCase(projectName))
{
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start
System.out.println("CURRENT PICK TYPE AFTER["+pickType+"]ShipType["+shipType+"]");
/*getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
tranCod = (String)getTranInfo.get("TRAN_CODE");*/
//if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow))
if(("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow)) || (globalSingleLot.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow)))
//Changed By Pragyan 14/08/14 for tran code and loc type parent start.
if(tranCodeInput == null || tranCodeInput.trim().length() <= 0)
{
System.out.println("searching for parcel transporter");
pickType = "P";
long startTime2 = System.currentTimeMillis();
//chnaged by pragyan on 15/10/14 for cold chain
//getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,locTypeParent, conn);
long endTime2 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE P IN SECONDS:::["+(endTime2-startTime2)/1000+"]");
if(!pickType.equalsIgnoreCase((String)getTranInfo.get("SHIP_TYPE")))
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start
System.out.println("CURRENT PICK TYPE AFTER["+pickType+"]ShipType["+shipType+"]");
/*getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
tranCod = (String)getTranInfo.get("TRAN_CODE");*/
//if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow))
if(("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow)) || (globalSingleLot.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow)))
{
System.out.println("searching for master transporter");
pickType = "M";
long startTime3 = System.currentTimeMillis();
System.out.println("searching for parcel transporter");
pickType = "P";
long startTime2 = System.currentTimeMillis();
//chnaged by pragyan on 15/10/14 for cold chain
//getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,locTypeParent, conn);
long endTime2 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE P IN SECONDS:::["+(endTime2-startTime2)/1000+"]");
if(!pickType.equalsIgnoreCase((String)getTranInfo.get("SHIP_TYPE")))
{
System.out.println("searching for master transporter");
pickType = "M";
long startTime3 = System.currentTimeMillis();
//chnaged by pragyan on 15/10/14 for cold chain
//getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,locTypeParent, conn);
long endTime3 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE M IN SECONDS:::["+(endTime3-startTime3)/1000+"]");
}
}
else
{
System.out.println("searching for transporter["+pickType);
long startTime4 = System.currentTimeMillis();
//chnaged by pragyan on 15/10/14 for cold chain
//getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,locTypeParent, conn);
long endTime3 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE M IN SECONDS:::["+(endTime3-startTime3)/1000+"]");
long endTime4 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE +"+pickType+" IN SECONDS:::["+(endTime4-startTime4)/1000+"]");
}
}
else
{
System.out.println("searching for transporter["+pickType);
long startTime4 = System.currentTimeMillis();
//chnaged by pragyan on 15/10/14 for cold chain
//getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,locTypeParent, conn);
long endTime4 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GET TRANSPORTER INFO FOR PICKT TYPE +"+pickType+" IN SECONDS:::["+(endTime4-startTime4)/1000+"]");
getTranInfo = getArgTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,tranCodeInput, conn);
}
}
else
{
getTranInfo = getArgTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType,tranCodeInput, conn);
}
//Changed By Pragyan 14/08/14 for tran code and loc type parent end.
if(getTranInfo != null & getTranInfo.size() > 0)
{
//Changed By Pragyan 14/08/14 for tran code and loc type parent end.
if(getTranInfo != null & getTranInfo.size() > 0)
{
tranCod = (String)getTranInfo.get("TRAN_CODE");
}
else
{
tranCod = "";
}
}
else
{
tranCod = "";
}
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end
//Changed By Pragyan for Site transporter
siteCodeShip = (String)getTranInfo.get("SHIP_CODE");
......@@ -3278,6 +3288,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("Clear the SaleOrder Map List------------------->Check"+saleOrderWiseMap.size());
//Changed by Rohan to Clear
printMode = checkNull(discommon.getDisparams("999999","WAVE_PRINT_MODE",conn));
//Changes by Dadaso pawar on 04/06/15 [Start]
projectName = checkNull(discommon.getDisparams("999999","PROJECT",conn));
System.out.println("projectName Process-------->>["+projectName+"]");
//Changes by Dadaso pawar on 04/06/15 [End]
//isADSIConnReq = discommon.getDisparams("999999","CONN_TO_ADSI_APP",conn);
//Changed By Pragyan to create wave for mannual allocated data
//updateMannualStockMap(detailDom, conn);
......@@ -3384,6 +3398,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if ( childNode != null && childNode.getFirstChild() != null )
{
isActivePickChecked = childNode.getFirstChild().getNodeValue();
System.out.println("From DOM="+isActivePickChecked);
}
}
if (childNodeName.equals("stock_to_dock_allow"))
......@@ -3554,7 +3569,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("N".equalsIgnoreCase(isActivePickChecked))
{
allocQty = Math.floor(allocQty / packSize) * packSize;
System.out.println("Pack Size="+packSize);
System.out.println("After calculation="+allocQty);
}
//Changed by Rohan on 15-04-13 for if active pick is N then allocate only case quantity.end
......@@ -4064,6 +4080,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}*/
//if(allocQty > 0 && (!manualStock))
System.out.println("***********Alloc="+allocQty+"Flag="+allocFlag);
if(allocQty > 0 || "M".equalsIgnoreCase(allocFlag))
{
/*
......@@ -6687,7 +6704,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
frmDomParcelPackAllow = checkNull(genericUtility.getColumnValue("parcelpack_allow",headerDom));
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom));
System.out.println("wavetaskinsert::::::::"+remarks);
System.out.println("wavetaskinsert::::::::"+remarks);
System.out.println("saleOrderFrom::::::::"+saleOrderFrom);
System.out.println("saleOrderTo::::::::"+saleOrderTo);
System.out.println("custCodeTo::::::::"+custCodeTo);
System.out.println("tranCodeInput::::::::"+tranCodeInput);
/*//Changes by Dadaso pawar on 17/03/15 [Start]
consoliRepl = checkNull(genericUtility.getColumnValue("consolidate_repl",headerDom));
consoliRepl = consoliRepl.trim();
......@@ -7139,7 +7160,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 25-aug-14 changed logic for getting transporter.
/*if( tranCodeInput == null || tranCodeInput.trim().length() <= 0 )
{*/
//Changes by Dadaso pawar on 04/06/15 [Start]
System.out.println("projectName----------["+projectName+"]");
if("DDUK".equalsIgnoreCase(projectName))
{
System.out.println("-----------DDUK--------------");
transPorterInfoMap = getArgTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,tranCodeInput, conn);
System.out.println("transPorterInfoMap--------->>"+transPorterInfoMap);
tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE");
}
else
{
if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
{
pickType = "M";
......@@ -7288,7 +7320,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 25-aug-14 changed logic for getting transporter.end
//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.end
}
......@@ -17361,7 +17393,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
HashMap dataVolumeMap = new HashMap();
try {
System.out.println("@@LOT NO["+lotNo+"]");
//Changed By Rekha To add columns required for ADSI
//Changed By Pragyan 12/03/13 To set hazardous item check
//sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
......@@ -17376,8 +17408,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt = con.prepareStatement(sql);
if(lotNo != null && lotNo.length() > 0)
//changed by wasim on 15-06-2015 [START]
//if(lotNo != null && lotNo.length() > 0)
//{
if(lotNo != null && (lotNo.trim()).length() > 0)
{
//changed by wasim on 15-06-2015 [START]
pstmt.setString(1, lotNo);
pstmt.setString(2, lotNo);
}
......@@ -20127,7 +20163,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String custCode = "",stanCode = "",siteCodeShip = "",stateCodeDlv = "",shipConsGrp = ""
//Changed By Rekha to get additional fields for ADSI
,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",shipAdd3 = "",
shipPh="",shipFax ="",shipMailId = "",custPord = "",dlvPin = "", frtTerm = "";
shipPh="",shipFax ="",shipMailId = "",custPord = "",dlvPin = "", frtTerm = "",tranCode = "",transMod = "";
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
String licenceNo = "";
java.sql.Date lincenceUpto = null;
......@@ -20187,7 +20223,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
+" S.DLV_PIN AS DLV_PIN, "
//changed by Pragyan on 23/12/13 for getting FRT TERM.
+" S.FRT_TERM AS FRT_TERM"
+" S.FRT_TERM AS FRT_TERM,"
+" S.TRAN_CODE AS TRAN_CODE," //Changed by Dadaso pawar on 05/06/15
+" S.TRANS_MODE AS TRANS_MODE"
+" FROM SORDER S,CUSTOMER C"
+" WHERE S.CUST_CODE__DLV = C.CUST_CODE "
+" AND S.SALE_ORDER = ? ";
......@@ -20220,6 +20258,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
lincenceUpto = rs.getDate("DRUG_LICNO1_UPTO");
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto end.
frtTerm = rs.getString("FRT_TERM");
//Changed by Dadaso pawar on 05/06/15 [Start]
tranCode = rs.getString("TRAN_CODE");
transMod = rs.getString("TRANS_MODE");
//Changed by Dadaso pawar on 05/06/15 [End]
}
//changed by sankara on 14/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
if( rs != null )
......@@ -20283,6 +20325,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sordInfoMap.put("FAX", shipFax);
sordInfoMap.put("CUST_PORD", custPord);
sordInfoMap.put("DLV_PIN", dlvPin);
System.out.println("projectName-------->>"+projectName+"]");
//Changed by Dadaso pawar on 05/06/15 [Start]
if("DDUK".equalsIgnoreCase(projectName))
{
sordInfoMap.put("TRAN_CODE", tranCode);
sordInfoMap.put("TRANS_MODE", transMod);
}
//Changed by Dadaso pawar on 05/06/15 [End]
//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
sordInfoMap.put("DRUG_LIC_NO_1", licenceNo);
sordInfoMap.put("DRUG_LICNO1_UPTO", lincenceUpto);
......@@ -25177,14 +25228,21 @@ private HashMap getArgTransporterInfoMap(String saleOrder, double perShipWeight
try
{
System.out.println("transporterCode::::::::::::::"+transporterCode);
System.out.println("transporterCode::::::::::::::"+transporterCode);
System.out.println("projectName-------->>["+projectName+"]");
HashMap sordMap = getSordInfo(saleOrder,conn);
siteCodeShip = (String)sordMap.get("SHIP_CODE");
stanCodeCust = (String)sordMap.get("STAN_CODE");
custCodeDlv = (String)sordMap.get("CUST_CODE");
stateCodeCust = (String)sordMap.get("STATE_DLV");
//Changed by Dadaso pawar on 05/06/15 [For DDUK] start
if("DDUK".equalsIgnoreCase(projectName))
{
tranCode = (String)sordMap.get("TRAN_CODE");
transMode = (String)sordMap.get("TRANS_MODE");
}
//Changed by Dadaso pawar on 05/06/15 [For DDUK] end
stationInfoMap = getStanCodeInfo(siteCodeShip, conn);
stanCodeFrm = (String)stationInfoMap.get("STAN_CODE");
stateCodeFrm = (String)stationInfoMap.get("STATE_CODE");
......
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