Skip to content

B
business-java
Commit 4110fd97 authored by vvengurlekar's avatar vvengurlekar
Browse files
Options

wms3pl summary level changes done .Userlevel rights added for summary 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105362 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0158a43f
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 77 deletions
webitm-dashboard/ibase/dashboard/wms/ejb/WMS3PLSummDtlDashboard.java
View file @ 4110fd97
package ibase.dashboard.wms.ejb; package ibase.dashboard.wms.ejb;
import ibase.dashboard.Report.Utility.DashboardUtility;
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;
...@@ -33,7 +32,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -33,7 +32,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataShpmentEffiJson = new JSONObject(); JSONObject rawDataShpmentEffiJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -179,7 +178,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -179,7 +178,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" WHERE a.site_code=o.site_code"+ " WHERE a.site_code=o.site_code"+
" )AS AVG_DELAY"+ " )AS AVG_DELAY"+
" FROM site o"+ " FROM site o"+
" WHERE facility_code = '"+facilityCode+"'"+ " WHERE facility_code = '"+facilityCode+"' "+ getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) "; " ) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs= pstmt.executeQuery(); rs= pstmt.executeQuery();
...@@ -518,7 +517,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -518,7 +517,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataShpmentEffiJson = new JSONObject(); JSONObject rawDataShpmentEffiJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -644,7 +643,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -644,7 +643,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" "+appendSql+" and so.CONF_DATE between '"+frmDate+"' and '"+toDate+"' "+ " "+appendSql+" and so.CONF_DATE between '"+frmDate+"' and '"+toDate+"' "+
" where so.site_code = o.site_code "+ " where so.site_code = o.site_code "+
" ) as ON_TIME"+ " ) as ON_TIME"+
" from site o where facility_code = '"+facilityCode+"' "+ " from site o where facility_code = '"+facilityCode+"' "+ getSiteCode(sessionUserLevel, sessionSiteCode)+
" )M "; " )M ";
...@@ -771,6 +770,16 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -771,6 +770,16 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
int count = 0; int count = 0;
/*facilityCode = "FC001"; /*facilityCode = "FC001";
businessType = "T";*/ businessType = "T";*/
String frmDate = "";
String toDate = "";
//Added by Varsha V. on dated 17/04/2017 for mtd date format also added in sql
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd-MMM-yy");
Calendar calendar = Calendar.getInstance();
toDate = simpleDateFormat.format(calendar.getTime());
//System.out.println("toDate :"+toDate);
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
frmDate = simpleDateFormat.format(calendar.getTime());
String appendSql = ""; String appendSql = "";
if(businessType.length()>0) if(businessType.length()>0)
{ {
...@@ -805,7 +814,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -805,7 +814,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" NVL(COUNT(Sale_Order),0) Total_Order"+ " NVL(COUNT(Sale_Order),0) Total_Order"+
" FROM sorder a, itemser its"+ " FROM sorder a, itemser its"+
" where"+ " where"+
" a.item_ser = its.item_ser "+appendSql+" "+ " a.item_ser = its.item_ser "+appendSql+" AND a.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and a.site_code=o.site_code"+ " and a.site_code=o.site_code"+
" ) as Total_Order,"+ " ) as Total_Order,"+
" ( SELECT"+ " ( SELECT"+
...@@ -813,14 +822,14 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -813,14 +822,14 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" FROM sorditem,"+ " FROM sorditem,"+
" Sorder, itemser its"+ " Sorder, itemser its"+
" WHERE Sorder.Sale_Order =sorditem.Sale_Order"+ " WHERE Sorder.Sale_Order =sorditem.Sale_Order"+
" AND sorditem.Qty_Ord-sorditem.qty_Desp>0"+ " AND sorditem.Qty_Ord-sorditem.qty_Desp>0 AND Sorder.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and Sorder.item_ser = its.item_ser "+appendSql+" "+ " and Sorder.item_ser = its.item_ser "+appendSql+" "+
" and sorder.site_code=o.site_code"+ " and sorder.site_code=o.site_code"+
" )Pending_Item, "+ " )Pending_Item, "+
" (SELECT"+ " (SELECT"+
" NVL(COUNT(Sale_Order),0) On_Hold"+ " NVL(COUNT(Sale_Order),0) On_Hold"+
" FROM sorder, itemser its"+ " FROM sorder, itemser its"+
" WHERE status='H'"+ " WHERE status='H' AND Sorder.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and sorder.item_ser = its.item_ser "+appendSql+" "+ " and sorder.item_ser = its.item_ser "+appendSql+" "+
" and sorder.site_code=o.site_code"+ " and sorder.site_code=o.site_code"+
" ) On_Hold ,"+ " ) On_Hold ,"+
...@@ -831,19 +840,19 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -831,19 +840,19 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" WHERE Sorder.Sale_Order =sorditem.Sale_Order"+ " WHERE Sorder.Sale_Order =sorditem.Sale_Order"+
" AND sorditem.Qty_Ord-sorditem.qty_Desp>0"+ " AND sorditem.Qty_Ord-sorditem.qty_Desp>0"+
" AND sorditem.Date_DESP <CURRENT_DATE"+ " AND sorditem.Date_DESP <CURRENT_DATE"+
" and Sorder.item_ser = its.item_ser "+appendSql+" "+ " and Sorder.item_ser = its.item_ser "+appendSql+" AND Sorder.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and Sorder.site_code=o.site_code"+ " and Sorder.site_code=o.site_code"+
" )Past_Due_date ,"+ " )Past_Due_date ,"+
" (SELECT NVL(COUNT(Sale_Order),0) WIP"+ " (SELECT NVL(COUNT(Sale_Order),0) WIP"+
" FROM sorder,itemser its"+ " FROM sorder,itemser its"+
" WHERE status IN ('H','P')"+ " WHERE status IN ('H','P')"+
" and sorder.item_ser = its.item_ser "+appendSql+" "+ " and sorder.item_ser = its.item_ser "+appendSql+" AND sorder.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and sorder.site_code=o.site_code"+ " and sorder.site_code=o.site_code"+
" )WIP ,"+ " )WIP ,"+
" (SELECT SUM(sorddet.quantity) Total_Sku"+ " (SELECT SUM(sorddet.quantity) Total_Sku"+
" FROM sorder, sorddet, itemser its"+ " FROM sorder, sorddet, itemser its"+
" WHERE sorder.Sale_order=sorddet.Sale_order"+ " WHERE sorder.Sale_order=sorddet.Sale_order"+
" and sorder.item_ser = its.item_ser "+appendSql+" "+ " and sorder.item_ser = its.item_ser "+appendSql+" AND sorder.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" and sorder.site_code=o.site_code"+ " and sorder.site_code=o.site_code"+
" )Total_Sku, "+ " )Total_Sku, "+
" (SELECT"+ " (SELECT"+
...@@ -863,7 +872,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -863,7 +872,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and S.Dsp_Date = I.Tran_Date "+ " and S.Dsp_Date = I.Tran_Date "+
" inner join sorder so on so.sale_order=S.sale_order "+ " inner join sorder so on so.sale_order=S.sale_order "+
" inner join itemser its on so.item_ser = its.item_ser "+appendSql+" "+ " inner join itemser its on so.item_ser = its.item_ser "+appendSql+" "+
" where so.site_code = o.site_code "+ " where so.site_code = o.site_code AND so.CONF_DATE BETWEEN '"+frmDate+"' AND '"+toDate+"' "+
" ) as ON_TIME"+ " ) as ON_TIME"+
" from site o where facility_code = '"+facilityCode+"' "+getSiteCode(sessionUserLevel, sessionSiteCode)+ " from site o where facility_code = '"+facilityCode+"' "+getSiteCode(sessionUserLevel, sessionSiteCode)+
" )M "; " )M ";
...@@ -968,7 +977,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -968,7 +977,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataWarehouseEffSummaryJson = new JSONObject(); JSONObject rawDataWarehouseEffSummaryJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -1481,7 +1490,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -1481,7 +1490,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " + " AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " +
" and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " + " and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " +
" and k.site_code = o.site_code ) pick_24 " + " and k.site_code = o.site_code ) pick_24 " +
" from site o where facility_code='"+facilityCode+"' " + " from site o where facility_code='"+facilityCode+"' "+ getSiteCode(sessionUserLevel, sessionSiteCode) +
" ) "; " ) ";
...@@ -2210,7 +2219,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -2210,7 +2219,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataWarehouseEffSummQtyJson = new JSONObject(); JSONObject rawDataWarehouseEffSummQtyJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -2749,7 +2758,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -2749,7 +2758,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " + " AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " +
" and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " + " and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " +
" and k.site_code = o.site_code ) pick_24 " + " and k.site_code = o.site_code ) pick_24 " +
" from site o where facility_code='"+facilityCode+"' " + " from site o where facility_code='"+facilityCode+"' " + getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) "; " ) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -3507,7 +3516,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -3507,7 +3516,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataWarehouseEffValueSummaryJson = new JSONObject(); JSONObject rawDataWarehouseEffValueSummaryJson = new JSONObject();
JSONObject rowData = null; JSONObject rowData = null;
...@@ -4021,7 +4030,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -4021,7 +4030,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " + " AND to_number(to_char(HDR.conf_date,'HH')) >23 and to_number(to_char(HDR.conf_date,'HH'))<= 24 And Hdr.Confirmed = 'Y')) " +
" and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " + " and not exists(select 1 from despatch where sord_no = k.sale_order and confirmed = 'Y') " +
" and k.site_code = o.site_code ) pick_24 " + " and k.site_code = o.site_code ) pick_24 " +
" from site o where facility_code='"+facilityCode+"' " + " from site o where facility_code='"+facilityCode+"' "+ getSiteCode(sessionUserLevel, sessionSiteCode) +
" ) " ; " ) " ;
...@@ -4758,7 +4767,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -4758,7 +4767,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
* */ * */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataOrderStatusSummStackJson = new JSONObject(); JSONObject rawDataOrderStatusSummStackJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -4940,7 +4949,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -4940,7 +4949,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" and a.status not in ('C','X','H') and a.confirmed = 'Y' " + " and a.status not in ('C','X','H') and a.confirmed = 'Y' " +
" ) as StockOut " + " ) as StockOut " +
" from site o where facility_code = '"+facilityCode+"' " + " from site o where facility_code = '"+facilityCode+"' " + getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -5571,7 +5580,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -5571,7 +5580,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
* */ * */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataOrderStatusSummPieJson = new JSONObject(); JSONObject rawDataOrderStatusSummPieJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -5755,7 +5764,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -5755,7 +5764,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" and a.status not in ('C','X','H') and a.confirmed = 'Y' " + " and a.status not in ('C','X','H') and a.confirmed = 'Y' " +
" ) as StockOut " + " ) as StockOut " +
" from site o where facility_code = '"+facilityCode+"' " + " from site o where facility_code = '"+facilityCode+"' " + getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -6225,7 +6234,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -6225,7 +6234,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataOrderStatusSummStackValWiseJson = new JSONObject(); JSONObject rawDataOrderStatusSummStackValWiseJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -6392,7 +6401,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -6392,7 +6401,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.item_ser = its.item_ser "+appendSql+" " + " and a.item_ser = its.item_ser "+appendSql+" " +
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" ) as StockOut " + " ) as StockOut " +
" from site o where facility_code = '"+facilityCode+"' " + " from site o where facility_code = '"+facilityCode+"' " + getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -7019,7 +7028,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7019,7 +7028,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryPieValWise(String facilityCode,String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException,ITMException public JSONObject getOrderStatusSummaryPieValWise(String facilityCode,String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException,ITMException
{ {
JSONObject rawDataOrderStatusSummPieValJson = new JSONObject(); JSONObject rawDataOrderStatusSummPieValJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -7180,7 +7189,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7180,7 +7189,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.item_ser = its.item_ser "+appendSql+" " + " and a.item_ser = its.item_ser "+appendSql+" " +
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" ) as StockOut " + " ) as StockOut " +
" from site o where facility_code = '"+facilityCode+"' " + " from site o where facility_code = '"+facilityCode+"' " + getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -7641,7 +7650,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7641,7 +7650,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException, ITMException public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException, ITMException
{ {
JSONObject rawDataOrderStatusSummStackJson = new JSONObject(); JSONObject rawDataOrderStatusSummStackJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -7819,7 +7828,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7819,7 +7828,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.item_ser = its.item_ser "+appendSql+" " + " and a.item_ser = its.item_ser "+appendSql+" " +
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" ) as StockOut " + " ) as StockOut " +
" from site o Where facility_code = '"+facilityCode+"' " + " from site o Where facility_code = '"+facilityCode+"' " +getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -8450,7 +8459,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8450,7 +8459,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode,String businessType, String dataSourceName, String sessionSiteCode) throws RemoteException,ITMException public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode,String businessType, String dataSourceName, String sessionSiteCode, String sessionUserLevel) throws RemoteException,ITMException
{ {
JSONObject rawDataOrderStatusSummPieJson = new JSONObject(); JSONObject rawDataOrderStatusSummPieJson = new JSONObject();
JSONObject rawJson = null; JSONObject rawJson = null;
...@@ -8631,7 +8640,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8631,7 +8640,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
" and a.item_ser = its.item_ser "+appendSql+" " + " and a.item_ser = its.item_ser "+appendSql+" " +
" and a.site_code = o.site_code " + " and a.site_code = o.site_code " +
" ) as StockOut " + " ) as StockOut " +
" from site o Where facility_code = '"+facilityCode+"' " + " from site o Where facility_code = '"+facilityCode+"' " +getSiteCode(sessionUserLevel, sessionSiteCode)+
" ) ) "; " ) ) ";
...@@ -9417,4 +9426,5 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -9417,4 +9426,5 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
} }
//Ended by varsha v. for showing results as per user rights on 13 April 2017 //Ended by varsha v. for showing results as per user rights on 13 April 2017
} }
webitm-dashboard/ibase/dashboard/wms/ejb/WMS3PLSummDtlDashboardLocal.java
View file @ 4110fd97
...@@ -13,33 +13,33 @@ import org.json.simple.JSONObject; ...@@ -13,33 +13,33 @@ import org.json.simple.JSONObject;
public interface WMS3PLSummDtlDashboardLocal extends ValidatorLocal public interface WMS3PLSummDtlDashboardLocal extends ValidatorLocal
{ {
/*New Requirement*/ /*New Requirement*/
public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPie(String facilityCode, String businessType, String dataSourceName, String siteCode, String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPie(String facilityCode, String businessType, String dataSourceName, String siteCode, String userLevel) throws RemoteException, ITMException ;
/*Value wise */ /*Value wise */
public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
/*Qty wise */ /*Qty wise */
public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
/*Added by Nikhil Requirement*/ /*Added by Nikhil Requirement*/
public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getShipmentEffDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getShipmentEffDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getSkuFillRateDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getSkuFillRateDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
/*Ended by Nikhil Requirement*/ /*Ended by Nikhil Requirement*/
public JSONObject getSalesOrderDetailGrid(String facilityCode,String businessType,String productCategory, String caption, String dataSourceName) throws RemoteException, ITMException; public JSONObject getSalesOrderDetailGrid(String facilityCode,String businessType,String productCategory, String caption, String dataSourceName) throws RemoteException, ITMException;
......
webitm-dashboard/ibase/dashboard/wms/ejb/WMS3PLSummDtlDashboardRemote.java
View file @ 4110fd97
...@@ -13,33 +13,33 @@ import org.json.simple.JSONObject; ...@@ -13,33 +13,33 @@ import org.json.simple.JSONObject;
public interface WMS3PLSummDtlDashboardRemote extends ValidatorRemote public interface WMS3PLSummDtlDashboardRemote extends ValidatorRemote
{ {
/*New Requirement*/ /*New Requirement*/
public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStack(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPie(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPie(String facilityCode, String businessType, String dataSourceName, String siteCode, String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPie(String facilityCode, String businessType, String dataSourceName, String siteCode, String userLevel) throws RemoteException, ITMException ;
/*Value wise */ /*Value wise */
public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStackValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPieValWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
/*Qty wise */ /*Qty wise */
public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlStackQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode) throws RemoteException, ITMException ; public JSONObject getOrderStatusSummaryPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
public JSONObject getOrderStatusDtlPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ; public JSONObject getOrderStatusDtlPieQtyWise(String facilityCode, String businessType, String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException ;
/*Added by Nikhil Requirement*/ /*Added by Nikhil Requirement*/
public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getShipmentEffSumm(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getShipmentEffDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getShipmentEffDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getSkuFillRateSumm(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getSkuFillRateDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getSkuFillRateDet(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetOrder(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetQty(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String siteCode) throws RemoteException, ITMException; public JSONObject getWarehouseEffSummValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
public JSONObject getWarehouseEffDetValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException; public JSONObject getWarehouseEffDetValue(String facilityCode,String businessType,String dataSourceName, String siteCode,String userLevel) throws RemoteException, ITMException;
/*Ended by Nikhil Requirement*/ /*Ended by Nikhil Requirement*/
public JSONObject getSalesOrderDetailGrid(String facilityCode,String businessType,String productCategory, String caption, String dataSourceName) throws RemoteException, ITMException; public JSONObject getSalesOrderDetailGrid(String facilityCode,String businessType,String productCategory, String caption, String dataSourceName) throws RemoteException, ITMException;
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryPieQtyWiseServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieQtyWiseServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieQtyWiseServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -51,13 +52,14 @@ public class OrderStatusSummaryPieQtyWiseServlet extends HttpServlet ...@@ -51,13 +52,14 @@ public class OrderStatusSummaryPieQtyWiseServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode+" sessionUserLevel: "+sessionUserLevel);
System.out.println("*********** In OrderStatusSummaryPieQtyWiseServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryPieQtyWiseServlet facilityCode is *************** =" + facilityCode);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPieQtyWise(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPieQtyWise(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryPieServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -51,12 +52,13 @@ public class OrderStatusSummaryPieServlet extends HttpServlet ...@@ -51,12 +52,13 @@ public class OrderStatusSummaryPieServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In OrderStatusSummaryPieServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryPieServlet facilityCode is *************** =" + facilityCode + " sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPie(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPie(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryPieValWiseServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieValWiseServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryPieValWiseServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -51,13 +52,14 @@ public class OrderStatusSummaryPieValWiseServlet extends HttpServlet ...@@ -51,13 +52,14 @@ public class OrderStatusSummaryPieValWiseServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In OrderStatusSummaryPieValWiseServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryPieValWiseServlet facilityCode is *************** =" + facilityCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPieValWise(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryPieValWise(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryStackQtyWiseServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackQtyWiseServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackQtyWiseServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel ="";
try try
{ {
...@@ -51,13 +52,14 @@ public class OrderStatusSummaryStackQtyWiseServlet extends HttpServlet ...@@ -51,13 +52,14 @@ public class OrderStatusSummaryStackQtyWiseServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In OrderStatusSummaryStackQtyWiseServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryStackQtyWiseServlet facilityCode is *************** =" + facilityCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStackQtyWise(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStackQtyWise(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryStackServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -53,12 +54,12 @@ public class OrderStatusSummaryStackServlet extends HttpServlet ...@@ -53,12 +54,12 @@ public class OrderStatusSummaryStackServlet extends HttpServlet
facilityCode = request.getParameter("facilityCode"); facilityCode = request.getParameter("facilityCode");
businessType = request.getParameter("businessType"); businessType = request.getParameter("businessType");
dataSourceName = request.getParameter("dataSourceName"); dataSourceName = request.getParameter("dataSourceName");
sessionUserLevel = userInfo.getUserLevel();
System.out.println("*********** In OrderStatusSummaryStackServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryStackServlet facilityCode is *************** =" + facilityCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStack(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStack(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/OrderStatusSummaryStackValWiseServlet.java
View file @ 4110fd97
...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackValWiseServlet extends HttpServlet ...@@ -40,6 +40,7 @@ public class OrderStatusSummaryStackValWiseServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -51,13 +52,14 @@ public class OrderStatusSummaryStackValWiseServlet extends HttpServlet ...@@ -51,13 +52,14 @@ public class OrderStatusSummaryStackValWiseServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In OrderStatusSummaryStackValWiseServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In OrderStatusSummaryStackValWiseServlet facilityCode is *************** =" + facilityCode+ " sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStackValWise(facilityCode, businessType, dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getOrderStatusSummaryStackValWise(facilityCode, businessType, dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/ShipmentEffSummServlet.java
View file @ 4110fd97
...@@ -38,6 +38,7 @@ public class ShipmentEffSummServlet extends HttpServlet ...@@ -38,6 +38,7 @@ public class ShipmentEffSummServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -49,13 +50,14 @@ public class ShipmentEffSummServlet extends HttpServlet ...@@ -49,13 +50,14 @@ public class ShipmentEffSummServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In ShipmentEffSummServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In ShipmentEffSummServlet facilityCode is *************** =" + facilityCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getShipmentEffSumm(facilityCode,businessType,dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getShipmentEffSumm(facilityCode,businessType,dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/SkuFillRateSummServlet.java
View file @ 4110fd97
...@@ -38,6 +38,7 @@ public class SkuFillRateSummServlet extends HttpServlet ...@@ -38,6 +38,7 @@ public class SkuFillRateSummServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -49,13 +50,14 @@ public class SkuFillRateSummServlet extends HttpServlet ...@@ -49,13 +50,14 @@ public class SkuFillRateSummServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In SkuFillRateSummServlet facilityCode is *************** =" + facilityCode); System.out.println("*********** In SkuFillRateSummServlet facilityCode is *************** =" + facilityCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getSkuFillRateSumm(facilityCode,businessType,dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getSkuFillRateSumm(facilityCode,businessType,dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/WarehouseEffSummQtyServlet.java
View file @ 4110fd97
...@@ -39,6 +39,7 @@ public class WarehouseEffSummQtyServlet extends HttpServlet ...@@ -39,6 +39,7 @@ public class WarehouseEffSummQtyServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -50,13 +51,14 @@ public class WarehouseEffSummQtyServlet extends HttpServlet ...@@ -50,13 +51,14 @@ public class WarehouseEffSummQtyServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In WarehouseEffSummQtyServlet siteCode is *************** =" + siteCode); System.out.println("*********** In WarehouseEffSummQtyServlet siteCode is *************** =" + siteCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummQty(facilityCode,businessType,dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummQty(facilityCode,businessType,dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/WarehouseEffSummServlet.java
View file @ 4110fd97
...@@ -39,6 +39,7 @@ public class WarehouseEffSummServlet extends HttpServlet ...@@ -39,6 +39,7 @@ public class WarehouseEffSummServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -50,12 +51,13 @@ public class WarehouseEffSummServlet extends HttpServlet ...@@ -50,12 +51,13 @@ public class WarehouseEffSummServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In WarehouseEffSummServlet siteCode is *************** =" + siteCode); System.out.println("*********** In WarehouseEffSummServlet siteCode is *************** =" + siteCode+" sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummOrder(facilityCode,businessType,dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummOrder(facilityCode,businessType,dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
webitm-dashboard/ibase/dashboard/wms/servlet/WarehouseEffSummValueServlet.java
View file @ 4110fd97
...@@ -39,6 +39,7 @@ public class WarehouseEffSummValueServlet extends HttpServlet ...@@ -39,6 +39,7 @@ public class WarehouseEffSummValueServlet extends HttpServlet
HttpSession session = null; HttpSession session = null;
UserInfoBean userInfo = null; UserInfoBean userInfo = null;
String sessionSiteCode = ""; String sessionSiteCode = "";
String sessionUserLevel = "";
try try
{ {
...@@ -50,13 +51,14 @@ public class WarehouseEffSummValueServlet extends HttpServlet ...@@ -50,13 +51,14 @@ public class WarehouseEffSummValueServlet extends HttpServlet
session = request.getSession(true); session = request.getSession(true);
userInfo = (UserInfoBean) session.getAttribute("USER_INFO"); userInfo = (UserInfoBean) session.getAttribute("USER_INFO");
sessionSiteCode = userInfo.getSiteCode(); sessionSiteCode = userInfo.getSiteCode();
sessionUserLevel = userInfo.getUserLevel();
System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode); System.out.println("in OrderStatusDtlPieQtyWiseServlet sessionSiteCode :"+sessionSiteCode);
System.out.println("*********** In WarehouseEffSummValueServlet siteCode is *************** =" + siteCode); System.out.println("*********** In WarehouseEffSummValueServlet siteCode is *************** =" + siteCode+ " sessionUserLevel: "+sessionUserLevel);
context = new InitialContext(appConnectParm.getProperty()); context = new InitialContext(appConnectParm.getProperty());
wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote"); wms3PLSummDtlDashboardRemote = (WMS3PLSummDtlDashboardRemote) context.lookup("ibase/WMS3PLSummDtlDashboard/remote");
jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummValue(facilityCode,businessType,dataSourceName,sessionSiteCode); jsonObjData = (JSONObject) wms3PLSummDtlDashboardRemote.getWarehouseEffSummValue(facilityCode,businessType,dataSourceName,sessionSiteCode,sessionUserLevel);
outputStream = response.getOutputStream(); outputStream = response.getOutputStream();
outputStream.write(jsonObjData.toString().getBytes()); outputStream.write(jsonObjData.toString().getBytes());
outputStream.flush(); outputStream.flush();
......
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