Skip to content

B
business-java
Commit f1f2eb43 authored by smestry's avatar smestry
Browse files
Options

Changed by Sneha. Updated the Warehouse User Activity dashboard. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98436 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 76778325
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1238 additions and 309 deletions
webitm-wms/module-resource/web/dashboard/.project 0 → 100755
View file @ f1f2eb43
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>dashboard</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
webitm-wms/module-resource/web/dashboard/wms/.project 0 → 100755
View file @ f1f2eb43
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>wms</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
webitm-wms/module-resource/web/dashboard/wms/jsp/.directory 0 → 100755
View file @ f1f2eb43
[Dolphin]
Timestamp=2015,7,24,11,27,59
Version=3
ViewMode=1
webitm-wms/module-resource/web/dashboard/wms/jsp/LocationStockOccupancy.jsp
View file @ f1f2eb43
...@@ -224,15 +224,23 @@ ...@@ -224,15 +224,23 @@
if( parseInt(stockDtl[5].childNodes[0].nodeValue) >0) if( parseInt(stockDtl[5].childNodes[0].nodeValue) >0)
{ {
newTable+="<tr> <td class='alert'>Hold Quantity</td> <td class='alert rght'>"+stockDtl[5].childNodes[0].nodeValue +"</td> </tr>"; newTable+="<tr> <td class='alert'>Hold Quantity</td> <td class='alert rght'>"+stockDtl[5].childNodes[0].nodeValue +"</td> </tr>";
//Changed by Sneha, for display of Lock Code on 16-07-2015, Request ID: SMWMS00008
newTable+="<tr> <td class='alert'>Lock Code</td> <td class='alert rght'>"+stockDtl[6].childNodes[0].nodeValue +"</td> </tr>";
//End by Sneha, for display of Lock Code on 16-07-2015, Request ID: SMWMS00008
} }
else else
{ {
newTable+="<tr> <td class='tdleftalign'>Hold Quantity</td> <td class='tdleftalign rght'>"+stockDtl[5].childNodes[0].nodeValue +"</td> </tr>"; newTable+="<tr> <td class='tdleftalign'>Hold Quantity</td> <td class='tdleftalign rght'>"+stockDtl[5].childNodes[0].nodeValue +"</td> </tr>";
} }
//newTable+="<tr> <td class='tdleftalign'>Allocated Qty</td> <td class='tdrghtalign'>"+stockDtl[6].childNodes[0].nodeValue +"</td> </tr> </table> </td> </tr> </tbody> </table>";
newTable+="<tr> <td class='tdleftalign'>Allocated Qty</td> <td class='tdrghtalign'>"+stockDtl[6].childNodes[0].nodeValue +"</td> </tr> </table> </td> </tr> </tbody> </table>";
//Changed by Sneha, for display of Lock Code on 16-07-2015, Request ID: SMWMS00008
newTable+="<tr> <td class='tdleftalign'>Allocated Qty</td> <td class='tdrghtalign'>"+stockDtl[7].childNodes[0].nodeValue +"</td> </tr> </table> </td> </tr> </tbody> </table>";
//End by Sneha, for display of Lock Code on 16-07-2015, Request ID: SMWMS00008
/* /*
newTable+="<TABLE id='stockTbl' class='stocktbl' cellpadding='0' cellspacing='0'>"; newTable+="<TABLE id='stockTbl' class='stocktbl' cellpadding='0' cellspacing='0'>";
for (n = 0; n<stockDtl.length; n++) for (n = 0; n<stockDtl.length; n++)
...@@ -370,7 +378,6 @@ span.appendChild(document.createTextNode(location)); ...@@ -370,7 +378,6 @@ span.appendChild(document.createTextNode(location));
</head> </head>
<% <%
try { try {
ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO"); ibase.utility.UserInfoBean userInfo = (ibase.utility.UserInfoBean) session.getAttribute("USER_INFO");
String user = userInfo.getLoginCode(); String user = userInfo.getLoginCode();
siteCode = userInfo.getSiteCode(); siteCode = userInfo.getSiteCode();
...@@ -386,10 +393,9 @@ span.appendChild(document.createTextNode(location)); ...@@ -386,10 +393,9 @@ span.appendChild(document.createTextNode(location));
xmlString = scmdasBean.getLocPhyArea(); xmlString = scmdasBean.getLocPhyArea();
} }
//add by Birendra Pandey on dated 21 Aug 2014 //add by Birendra Pandey on dated 21 Aug 2014
selectedArea = request.getParameter("area"); selectedArea = request.getParameter("area");
locationRange = request.getParameter("locationRange"); locationRange = request.getParameter("locationRange");
if(locationRange==null) if(locationRange==null)
{ {
locationRange =""; locationRange ="";
...@@ -397,7 +403,9 @@ span.appendChild(document.createTextNode(location)); ...@@ -397,7 +403,9 @@ span.appendChild(document.createTextNode(location));
System.out.println("expStock = "+expStock + " occupiedRack ="+occupiedRack+" retestDate ="+retestDate); System.out.println("expStock = "+expStock + " occupiedRack ="+occupiedRack+" retestDate ="+retestDate);
if(selectedArea!=null && selectedArea.trim().length() != 0 ) if(selectedArea!=null && selectedArea.trim().length() != 0 )
{ {
areaStr = scmdasBean.getLocDtl(selectedArea, siteCode,locationRange); areaStr = scmdasBean.getLocDtl(selectedArea.trim(), siteCode,locationRange);
//areaStr = scmdasBean.getLocDtl(selectedArea, siteCode,locationRange);
} }
System.out.println("areaStr is ="+areaStr); System.out.println("areaStr is ="+areaStr);
//end code on dated 21Aug2014 //end code on dated 21Aug2014
...@@ -421,8 +429,12 @@ span.appendChild(document.createTextNode(location)); ...@@ -421,8 +429,12 @@ span.appendChild(document.createTextNode(location));
<td>Area <select name="area" id="area"> <td>Area <select name="area" id="area">
<% <%
if (xmlString != null && xmlString.trim().length() > 0) if (xmlString != null && xmlString.trim().length() > 0)
{ {
System.out.println("areaStr is ="+xmlString);
dom = genericUtility.parseString(xmlString); dom = genericUtility.parseString(xmlString);
if (dom != null) if (dom != null)
{ {
......
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