Skip to content

B
business-java
Commit 3d5e5192 authored by pjain's avatar pjain
Browse files
Options

changed by sankara on 16/10/14 updated wavegenerationprc and locatiion stock... 

changed by sankara on 16/10/14 updated wavegenerationprc and locatiion stock occepency dashbaord and alter sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96602 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c7252cb5
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 57 deletions
webitm-wms/ibase/webitm/ejb/wms/LocationStockOccupancy.java
View file @ 3d5e5192
......@@ -166,6 +166,12 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
System.out.println("location Range from JSP ==="+locationRange);
}
//changed by sankara on 15/10/14 for case pick location
if(locPhyArea != null && locPhyArea.length() > 0)
{
locPhyArea = locPhyArea.trim();
}
sql = "select loc_code,loc_phy_row,loc_phy_col,loc_phy_stack from location where loc_phy_area = ? and site_code = ? "+locCode +" order by loc_phy_row, loc_phy_stack ,loc_phy_col";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locPhyArea);
......@@ -188,6 +194,11 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
}
if (count > 1 && !currentRow.equals(previousRow))
{
//changed by sankara on 15/10/14 for case pick location
if(previousStack.equals(cuurentStack))
{
xmlData.append("</loc_phy_stack > ");
}
xmlData.append("</loc_phy_row > ");
}
......@@ -195,6 +206,12 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
{
previousRow = checkNull(rs.getString("loc_phy_row"));
xmlData.append("<loc_phy_row row =\"" + currentRow + "\">");
//changed by sankara on 15/10/14 for case pick location
if(previousStack.equals(cuurentStack))
{
previousStack = checkNull(rs.getString("loc_phy_stack"));
xmlData.append("<loc_phy_stack stack=\"" + cuurentStack + "\">");
}
}
if (count == 1 || !previousStack.equals(cuurentStack))
......@@ -204,7 +221,7 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
}
xmlData.append("<loc_phy_col col=\"" + checkNull(rs.getString("loc_phy_col")) + "\">");
sql = "select s.item_code, s.site_code, s.loc_code, s.lot_no, s.lot_sl, s.exp_date, s.quantity, s.alloc_qty, s.hold_qty , s.mfg_date, s.exp_date, s.retest_date , i.descr from stock s ,item i where s.quantity >0 and s.exp_date <= sysdate and s.item_code=i.item_code and s.loc_code =? and s.site_code =?";
sql = "select s.item_code, s.site_code, s.loc_code, s.lot_no, s.lot_sl, s.exp_date, s.quantity, s.alloc_qty, s.hold_qty , s.mfg_date, s.exp_date, s.retest_date , i.descr from stock s ,item i where s.quantity >0 and s.item_code=i.item_code and s.loc_code =? and s.site_code =?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, locationCode);
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 3d5e5192
......@@ -315,6 +315,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String saleOrdertype = "";
//changed by sankara on 26/09/14 getting order type
String siteCodeShip = "";
//chnaged by pragyan on 15/10/14 for cold chain
String locTypeParent = "";
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");
......@@ -504,7 +506,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE , SORDITEM.MAX_SHELF_LIFE AS MAX_SHELF_LIFE"
+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW "
+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM "
+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
//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 "
+"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 "
......@@ -677,7 +681,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
unitStd = checkNull(rs.getString("UNIT__STD"));
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");
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");
if(unitStd != "")
{
mbaseUnit = unitStd;
......@@ -782,7 +788,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("searching for parcel transporter");
pickType = "P";
long startTime2 = System.currentTimeMillis();
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
//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+"]");
......@@ -791,7 +799,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("searching for master transporter");
pickType = "M";
long startTime3 = System.currentTimeMillis();
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
//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+"]");
}
......@@ -800,7 +810,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
System.out.println("searching for transporter["+pickType);
long startTime4 = System.currentTimeMillis();
getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
//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+"]");
}
......@@ -6555,7 +6567,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String frmDomMasterPackAllow = "";
String frmDomParcelPackAllow = "";
//Changed By sankara 17/05/14 for added remarks in wave proccess screen
String remarks = "";
String remarks = "";
//chnaged by pragyan on 15/10/14 for cold chain
String locTypeParent = "";
try
{
......@@ -6832,6 +6846,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println("wave Id :"+waveId);
saleOrder = sorderKey.substring(0,sorderKey.indexOf(":"));
System.out.println("Current sorder No>>>>>>>>>>>>["+saleOrder+"]");
//chnaged by pragyan on 15/10/14 for cold chain
locTypeParent = sorderKey.substring(sorderKey.indexOf(":") + 1);
int itemMapListLen = itemMapList.size();
System.out.println("Current Sorder No :["+sorderKey+"]Map Length["+itemMapListLen+"]");
//Changed By Pragyan to pass the orderinfos
......@@ -7034,23 +7050,30 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("Y".equalsIgnoreCase(frmDomMasterPackAllow) && "Y".equalsIgnoreCase(frmDomParcelPackAllow))
{
pickType = "P";
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,locTypeParent, conn);
if(!pickType.equalsIgnoreCase((String)transPorterInfoMap.get("SHIP_TYPE")))
{
pickType = "M";
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,locTypeParent, conn);
}
}
else
{
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType, conn);
transPorterInfoMap = getTransporterInfoMap(saleOrder,totalWeightCurrentshipment,totCaseCount,pickType,shipType,locTypeParent, conn);
}
if(transPorterInfoMap != null & transPorterInfoMap.size() > 0)
{
if("M".equalsIgnoreCase((String)transPorterInfoMap.get("SHIP_TYPE")) && currentCaseCount < 2 )
//chnaged by pragyan on 15/10/14 for cold chain
String strgCondn = (String)transPorterInfoMap.get("IS_STORAGE_CONDN"); //IS_STORAGE_CONDN
System.out.println("Storage Condition ["+strgCondn+"]");
if("M".equalsIgnoreCase((String)transPorterInfoMap.get("SHIP_TYPE")) && currentCaseCount < 2 && "N".equalsIgnoreCase(strgCondn) )
{
System.out.println("totalWeightCurrentshipment AFTER currentCaseWeight"+(currentCaseWeight + currentActWeight)+"]");
System.out.println("currentCaseVolume AFTER"+currentCaseVolume+"]");
......@@ -7063,8 +7086,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
shipType = "P";
}
transPorterInfoMap = getTransporterInfoMap(saleOrder,(currentCaseWeight + currentActWeight),currentCaseCount,"P",shipType, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//transPorterInfoMap = getTransporterInfoMap(saleOrder,(currentCaseWeight + currentActWeight),currentCaseCount,"P",shipType, conn);
transPorterInfoMap = getTransporterInfoMap(saleOrder,(currentCaseWeight + currentActWeight),currentCaseCount,"P",shipType,locTypeParent, conn);
if(transPorterInfoMap != null & transPorterInfoMap.size() > 0)
{
......@@ -7722,7 +7746,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
double unitValue = 0.0;
LinkedHashMap<String , Double> actCartonWeightMap = new LinkedHashMap<String , Double>();
//Changed By Rekha WM3BSUN006 20/05/13 To get the SOAP connection.end
//chnaged by pragyan on 15/10/14 for cold chain
String strgCondn = "N";
try
{
......@@ -7744,6 +7769,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
isADSIConnReq = isADSIConnReq != null?isADSIConnReq:"N";
//changed by pragyan on 14/08/14 trancode and loc type parent start.
isTrancodeInput = (String)transportInfoMap.get("IS_DIRECT_TRANSPORTER");
//chnaged by pragyan on 15/10/14 for cold chain
strgCondn = (String)transportInfoMap.get("IS_STORAGE_CONDN");
//docLoc = getDocLoc(tranCode, conn);
//changed by pragyan on 22/09/14 for site transporter
docLoc = getDocLoc(tranCode,siteCodeShip, conn);
......@@ -8075,7 +8102,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 31/12/12
//if(cashCount >= 2)
//if(totCaseCount >= 2)
if(totCaseCount >= 2 || "Y".equalsIgnoreCase(pPickAllow))
System.out.println("MASTER PACK Storage Condition["+strgCondn+"]");
//Changed By Pragyan 15/10/14 for cold chain
if(totCaseCount >= 2 || "Y".equalsIgnoreCase(pPickAllow) || "Y".equalsIgnoreCase(strgCondn))
//if(totCaseCount >= 2 || "Y".equalsIgnoreCase(pPickAllow))
{
if("Y".equalsIgnoreCase(isSinglePickMasterPack))
{
......@@ -17992,22 +18023,50 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
*/
//Changed By Pragyan To Check Site Transporter on 19-SEP-14 [W14FSUN003]
//private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,Connection conn) throws ITMException
private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,Connection conn) throws ITMException
//chnaged by pragyan on 15/10/14 for cold chain
//private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,Connection conn) throws ITMException
private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,String locTypeParent ,Connection conn) throws ITMException
{
HashMap distRouteDataMap = null;
String tranCode = "";
//STORAGE_CONDN
try
{
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,true, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,true, conn);
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,true,locTypeParent, conn);
if(distRouteDataMap != null)
{
tranCode = (String)distRouteDataMap.get("TRAN_CODE");
if(!(tranCode.length() > 0))
{
//distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false, conn);
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,true,"", conn);
}
}
if(distRouteDataMap != null)
{
tranCode = (String)distRouteDataMap.get("TRAN_CODE");
if(!(tranCode.length() > 0))
{
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false, conn);
//chnaged by pragyan on 15/10/14 for cold chain
//distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false, conn);
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false,locTypeParent, conn);
}
if(distRouteDataMap != null)
{
tranCode = (String)distRouteDataMap.get("TRAN_CODE");
if(!(tranCode.length() > 0))
{
//distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false, conn);
distRouteDataMap = getTransporterInfoMap(saleOrder,perShipWeight ,noArt,pickType , shipType ,false,"", conn);
}
}
}
}
......@@ -18031,7 +18090,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return distRouteDataMap;
}
private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,boolean isSiteTransporter,Connection conn) throws ITMException
//chnaged by pragyan on 15/10/14 for cold chain
private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,boolean isSiteTransporter,String locTypeParent,Connection conn) throws ITMException
//private HashMap getTransporterInfoMap(String saleOrder,double perShipWeight ,double noArt,String pickType , String shipType ,boolean isSiteTransporter,Connection conn) throws ITMException
{
String sql = "";
String sql1 = "";
......@@ -18052,6 +18113,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By Pragyan 23-DEC-13 To check ADSI Connection is required.(KB/Ashish mail Dt.121413)
String adsiFlag = "";
String sSQL = "";
//chnaged by pragyan on 15/10/14 for cold chain
boolean isStorageCondExist = false;
try
{
......@@ -18073,6 +18137,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE T.SITE_CODE = '"+siteCodeShip+"' AND ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND (A.DIST_ROUTE = B.DIST_ROUTE) AND (T.TRAN_CODE = A.TRAN_CODE) AND ";
//chnaged by pragyan on 15/10/14 for cold chain
if(locTypeParent != null && locTypeParent.trim().length() > 0)
{
sSQL = sSQL + " A.STORAGE_CONDN = '"+locTypeParent+"' AND ";
isStorageCondExist = true;
}
}
else
{
......@@ -18080,6 +18151,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " WHERE ( A.PIN__FR = ? OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ? OR A.PIN__TO = ' ') AND (A.STAN_CODE__FR =? OR A.STAN_CODE__FR = ' ' ) "
+ " AND ( A.STAN_CODE__TO =? OR A.STAN_CODE__TO = ' ') AND ( A.STATE_CODE__FR = ? OR A.STATE_CODE__FR = ' ') "
+ " AND ( A.STATE_CODE__TO = ? OR A.STATE_CODE__TO = ' ' ) AND (A.DIST_ROUTE = B.DIST_ROUTE) AND (T.TRAN_CODE = A.TRAN_CODE) AND ";
//chnaged by pragyan on 15/10/14 for cold chain
if(locTypeParent != null && locTypeParent.trim().length() > 0)
{
sSQL = sSQL + " A.STORAGE_CONDN = '"+locTypeParent+"' AND ";
isStorageCondExist = true;
}
}
if(("P".equalsIgnoreCase(pickType) && "P".equalsIgnoreCase(shipType)) || ("M".equalsIgnoreCase(pickType) && "M".equalsIgnoreCase(shipType)) )//|| "".equalsIgnoreCase(shipType) || "L".equalsIgnoreCase(shipType))
......@@ -18472,6 +18550,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
transInfoMap.put("ADSI_FLAG",adsiFlag);
//Changed Prgayna 14/08/14 for is direct transporter code start.
transInfoMap.put("IS_DIRECT_TRANSPORTER","N");
//chnaged by pragyan on 15/10/14 for cold chain
if(isStorageCondExist)
{
transInfoMap.put("IS_STORAGE_CONDN","Y");
}
else
{
transInfoMap.put("IS_STORAGE_CONDN","N");
}
transInfoMap.putAll(sordMap);
if( rs != null )
......
webitm-wms/module-resource/sql/update.sql
View file @ 3d5e5192
......@@ -50001,7 +50001,9 @@ and form_no ='3';
update obj_forms set disp_metadata ='checkedImage@img<lot_no__to>, <lot_sl__to>, <quantity>, <unit> = <loc_code__sys>'
where win_name ='w_stocktransfer_multi_wiz'
and form_no ='4';
--changed by sankara on 16/10/14 alter sql
ALTER TABLE DISTROUTEDET ADD STORAGE_CONDN CHAR(3);
COMMIT;
webitm-wms/module-resource/web/jsp/LocationStockOccupancy.jsp
View file @ 3d5e5192
......@@ -10,7 +10,7 @@
<%@page import="java.util.List"%>
<%@page import="org.w3c.dom.NodeList"%>
<%@page import="ibase.webitm.utility.GenericUtility"%>
<%@page import="ibase.dashboard.scm.bean.*"%>
<jsp:useBean id="scmdasBean" scope="request" class="ibase.webitm.bean.wms.LocationStockOccuBean" />
<html>
<head>
......@@ -99,11 +99,9 @@
var newTable,startTag,endTag;
startTag="<TABLE id='parentStkTbl' class='parentstktbl' ><TBODY>"
endTag="</TBODY></TABLE>"
newTable=startTag;
<% areaStr = areaStr.replaceAll("\"", "'"); %>
data="<%=areaStr%>";
newTable=startTag;
data = document.getElementById("stock").value;
if (window.DOMParser)
{
......@@ -297,23 +295,22 @@ span.appendChild(document.createTextNode(location));
try {
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
String user = userInfo.getLoginCode();
siteCode = request.getParameter("SITE_CODE");
System.out.println("siteCode:::::"+siteCode);
if (siteCode == null || siteCode.trim().length() == 0 )
//String user = userInfo.getLoginCode();
siteCode = userInfo.getSiteCode();
System.out.println("siteCodebeforeif::::"+siteCode);
// siteCode =request.getParameter("siteCode");
if (siteCode == null || siteCode.trim().length() == 0 )
{
siteCode = userInfo.getSiteCode();
// siteCode = "TA387";
siteCode = "TA387";
System.out.println("siteCodeinsideif::::"+siteCode);
}
//siteCode = "TA821";//this is static .because there is no data found
if(xmlString == "")
if(xmlString == "")
{
xmlString = scmdasBean.getLocPhyArea();
}
//Add New Code on dated 21 Aug 2014
//add by Birendra Pandey on dated 21 Aug 2014
selectedArea = request.getParameter("area");
locationRange = request.getParameter("locationRange");
locationRange = request.getParameter("locationRange");
if(locationRange==null){
locationRange ="";
}
......@@ -331,7 +328,7 @@ span.appendChild(document.createTextNode(location));
<table class="pagetitle">
<tr>
<td> Location Stock Occupancy</td>
<td height="26" align="right"> <img id='img' class="img" alt="" src="/ibase/dashboard/scm/images/index.jpeg" onclick="divopen()" />
<td height="26" align="right"> <img id='img' class="img" alt="" src="/ibase/wms/images/index.jpeg" onclick="divopen()" />
</tr>
</table>
......@@ -366,7 +363,7 @@ span.appendChild(document.createTextNode(location));
if (locPhyArea != "")
{
%>
<option class="area"><%=locPhyArea%>
<option><%=locPhyArea%>
</option>
<%
}
......@@ -379,11 +376,14 @@ span.appendChild(document.createTextNode(location));
%>
</select>
</td> <td> Location Range Like <input type text name="locationRange"
id="locationRange" size="10" value="<%=locationRange%>"></td>
</td>
<td> Location Range Like <input type text name="locationRange" id="locationRange" size="10" value="<%=locationRange%>">
</td>
</tr>
</table>
<input type hidden name="stock" id="stock" value="<%=areaStr.replaceAll("\"", "'")%>" >
<div style="position: absolute;left:300;top:94; ">
<table>
<tr>
......@@ -478,14 +478,14 @@ columnArray.add(columnNode.getAttributes().item(0).getNodeValue());
if(stockPresent && stockNotPresent)
{
imgSrc ="/ibase/dashboard/scm/images/yellow.png";
imgSrc ="/ibase/wms/images/yellow.png";
}else if(stockPresent)
{
imgSrc ="/ibase/dashboard/scm/images/green.png";
imgSrc ="/ibase/wms/images/green.png";
}else
{
imgSrc ="/ibase/dashboard/scm/images/white.png";
imgSrc ="/ibase/wms/images/white.png";
}
colImg.add(imgSrc);
}
......@@ -496,14 +496,14 @@ columnArray.add(columnNode.getAttributes().item(0).getNodeValue());
//System.out.println("isStkPresnt ="+isStkPresnt +" and isStkNotPresnt="+isStkNotPresnt);
if(isStkPresnt && isStkNotPresnt)
{
imagePath ="/ibase/dashboard/scm/images/yellow.png";
imagePath ="/ibase/wms/images/yellow.png";
}else if(isStkPresnt)
{
imagePath ="/ibase/dashboard/scm/images/green.png";
imagePath ="/ibase/wms/images/green.png";
}else if(isStkNotPresnt)
{
imagePath ="/ibase/dashboard/scm/images/white.png";
imagePath ="/ibase/wms/images/white.png";
}
%>
......@@ -587,15 +587,15 @@ columnArray.add(columnNode.getAttributes().item(0).getNodeValue());
if(stockPresent && stockNotPresent)
{
imgSrc ="/ibase/dashboard/scm/images/yellow.png";
imgSrc ="/ibase/wms/images/yellow.png";
}
else if(stockPresent)
{
imgSrc ="/ibase/dashboard/scm/images/green.png";
imgSrc ="/ibase/wms/images/green.png";
}
else if(stockNotPresent)
{
imgSrc ="/ibase/dashboard/scm/images/white.png";
imgSrc ="/ibase/wms/images/white.png";
}
%>
......@@ -672,8 +672,7 @@ columnArray.add(columnNode.getAttributes().item(0).getNodeValue());
</form>
<script>
areaCode ="<%=this.selectedArea%>";
locRange ="<%=this.locationRange%>";
locRange ="<%=this.locationRange%>";
document.getElementById("locationRange").value=locRange;
window.onload = new function() {
......
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