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
Expand all 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/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