Skip to content

B
business-java
Commit 9a7a9e1e authored by vpatil's avatar vpatil
Browse files
Options

BUG FOUND IN DASHBOARD RELEASE 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98186 ce508802-f39f-4f6c-b175-0d175dae99d5
parent de547190
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 12 deletions
webitm-wms/ibase/webitm/bean/wms/LocationStockOccuBean.java
View file @ 9a7a9e1e
...@@ -36,8 +36,13 @@ public class LocationStockOccuBean implements Serializable ...@@ -36,8 +36,13 @@ public class LocationStockOccuBean implements Serializable
String xmlData = ""; String xmlData = "";
try try
{ {
xmlData = locationStockOccupancyRemote.getLocPhyArea(); LocationStockOccupancyRemote areaRemote = null;
System.out.println("In xmlData ::::::::::" + xmlData); AppConnectParm appConnect = new AppConnectParm();
InitialContext ctx = new InitialContext(appConnect.getProperty());
System.out.println("In getLocPhyArea ::::::::::");
areaRemote = (LocationStockOccupancyRemote) ctx.lookup("ibase/LocationStockOccupancy/remote");
xmlData = areaRemote.getLocPhyArea();
System.out.println("In getLocPhyArea xmlData ::::::::::[" + xmlData+"]");
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -54,7 +59,13 @@ public class LocationStockOccuBean implements Serializable ...@@ -54,7 +59,13 @@ public class LocationStockOccuBean implements Serializable
String selectedEntity=""; String selectedEntity="";
try try
{ {
selectedEntity = locationStockOccupancyRemote.getSelectedArea(); LocationStockOccupancyRemote areaRemote = null;
AppConnectParm appConnect = new AppConnectParm();
InitialContext ctx = new InitialContext(appConnect.getProperty());
System.out.println("In getSelectedArea ::::::::::");
areaRemote = (LocationStockOccupancyRemote) ctx.lookup("ibase/LocationStockOccupancy/remote");
selectedEntity = areaRemote.getSelectedArea();
System.out.println("In selectedEntity ::::::::::"+selectedEntity);
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -70,8 +81,13 @@ public class LocationStockOccuBean implements Serializable ...@@ -70,8 +81,13 @@ public class LocationStockOccuBean implements Serializable
String xmlData =""; String xmlData ="";
try try
{ {
xmlData = locationStockOccupancyRemote.getLocDtl(locPhyArea,siteCode,locationRange); LocationStockOccupancyRemote areaRemote = null;
AppConnectParm appConnect = new AppConnectParm();
InitialContext ctx = new InitialContext(appConnect.getProperty());
areaRemote = (LocationStockOccupancyRemote) ctx.lookup("ibase/LocationStockOccupancy/remote");
xmlData = areaRemote.getLocDtl(locPhyArea,siteCode,locationRange);
System.out.println("In getLocDtl ::::::::::["+xmlData+"]");
} }
catch(Exception e) catch(Exception e)
{ {
......
webitm-wms/ibase/webitm/ejb/wms/LocationStockOccupancy.java
View file @ 9a7a9e1e
...@@ -4,9 +4,11 @@ import java.rmi.RemoteException; ...@@ -4,9 +4,11 @@ import java.rmi.RemoteException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import javax.ejb.Stateless; import javax.ejb.Stateless;
/** /**
...@@ -33,6 +35,8 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc ...@@ -33,6 +35,8 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
StringBuffer xmlData = null; StringBuffer xmlData = null;
try try
{ {
System.out.println("Calling EJB getLocPhyArea ---------");
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
...@@ -96,6 +100,7 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc ...@@ -96,6 +100,7 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
String selectedArea = ""; String selectedArea = "";
try try
{ {
System.out.println("Calling EJB getSelectedArea ---------");
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
...@@ -158,6 +163,7 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc ...@@ -158,6 +163,7 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
String locCode=""; String locCode="";
try try
{ {
System.out.println("Calling EJB getLocDtl ---------");
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
if(locationRange!=null && locationRange.trim().length()>0){ if(locationRange!=null && locationRange.trim().length()>0){
...@@ -203,8 +209,9 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc ...@@ -203,8 +209,9 @@ public class LocationStockOccupancy extends ValidatorEJB implements LocationStoc
xmlData.append("<loc_phy_stack stack=\"" + cuurentStack + "\">"); xmlData.append("<loc_phy_stack stack=\"" + cuurentStack + "\">");
} }
xmlData.append("<loc_phy_col col=\"" + checkNull(rs.getString("loc_phy_col")) + "\">"); xmlData.append("<loc_phy_col col=\"" + checkNull(rs.getString("loc_phy_col")) + "\">");
//Changed due to exp date<= sys date 30/06/15
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, s.unit 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, s.unit 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, s.unit 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 = conn.prepareStatement(sql);
pstmt1.setString(1, locationCode); pstmt1.setString(1, locationCode);
......
webitm-wms/module-resource/web/dashboard/metadataxml/taskactivity.xml
View file @ 9a7a9e1e
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<grid datasource='1' id='1' type='T'> <grid datasource='1' id='1' type='T'>
<component_type><![CDATA[DataGrid]]></component_type> <component_type><![CDATA[DataGrid]]></component_type>
<component_caption><![CDATA[Task status]]></component_caption> <component_caption><![CDATA[Task Status]]></component_caption>
<column_group id='assignTask'> <column_group id='assignTask'>
<col_group_title><![CDATA[Assign Task]]></col_group_title> <col_group_title><![CDATA[Assign Task]]></col_group_title>
...@@ -60,12 +60,12 @@ ...@@ -60,12 +60,12 @@
</column_group> </column_group>
<column_group id='totalTask'> <column_group id='totalTask'>
<col_group_title><![CDATA[Total Tasks]]></col_group_title> <col_group_title><![CDATA[TotalTasks]]></col_group_title>
<column_size><![CDATA[30]]></column_size> <column_size><![CDATA[35]]></column_size>
<column_alignment><![CDATA[right]]></column_alignment> <column_alignment><![CDATA[right]]></column_alignment>
<link_metadata><![CDATA[]]></link_metadata> <link_metadata><![CDATA[]]></link_metadata>
<columns> <columns>
<column id='totalTask'><![CDATA[Total Tasks]]></column> <column id='totalTask'><![CDATA[TotalTasks]]></column>
</columns> </columns>
</column_group> </column_group>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<chart_type id='bar'><![CDATA[StackedColumn2D]]></chart_type> <chart_type id='bar'><![CDATA[StackedColumn2D]]></chart_type>
<caption><![CDATA[Task Status ]]></caption> <caption><![CDATA[Task Status ]]></caption>
<height><![CDATA[350]]></height> <height><![CDATA[350]]></height>
<width><![CDATA[100%]]></width> <width><![CDATA[500]]></width>
<bg_color><![CDATA[F0F0F0]]></bg_color> <bg_color><![CDATA[F0F0F0]]></bg_color>
<showlegend><![CDATA[1]]></showlegend> <showlegend><![CDATA[1]]></showlegend>
<useroundedges><![CDATA[1]]></useroundedges> <useroundedges><![CDATA[1]]></useroundedges>
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
<chart_type id='bar'><![CDATA[MSCombiDY2D]]></chart_type> <chart_type id='bar'><![CDATA[MSCombiDY2D]]></chart_type>
<caption><![CDATA[Consignment Details]]></caption> <caption><![CDATA[Consignment Details]]></caption>
<height><![CDATA[350]]></height> <height><![CDATA[350]]></height>
<width><![CDATA[100%]]></width> <width><![CDATA[500]]></width>
<bg_color><![CDATA[F0F0F0]]></bg_color> <bg_color><![CDATA[F0F0F0]]></bg_color>
<showlegend><![CDATA[1]]></showlegend> <showlegend><![CDATA[1]]></showlegend>
<useroundedges><![CDATA[1]]></useroundedges> <useroundedges><![CDATA[1]]></useroundedges>
......
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