Commit 46c53944 authored by dkasliwal's avatar dkasliwal

Add Code for no data to display and check double condition for numeric value


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104196 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5ea40842
...@@ -43,6 +43,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -43,6 +43,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
boolean isRreturnValue = false;
try try
{ {
System.out.println("********** In WMS3PLSummDtlDashboard : getShipmentEffSumm Method ****************** "); System.out.println("********** In WMS3PLSummDtlDashboard : getShipmentEffSumm Method ****************** ");
...@@ -185,13 +186,13 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -185,13 +186,13 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
while(rs.next()) while(rs.next())
{ {
rowData = new JSONObject(); isRreturnValue = true;
rowData = new JSONObject();
rowData.put("total_order", rs.getString("TOTAL_ORDER")); rowData.put("total_order", checkDouble(rs.getString("TOTAL_ORDER")).trim());
rowData.put("on_time", (rs.getString("ON_TIME"))); rowData.put("on_time", checkDouble (rs.getString("ON_TIME")).trim());
rowData.put("delay_time", (rs.getString("DELAY_TIME"))); rowData.put("delay_time", checkDouble(rs.getString("DELAY_TIME")).trim());
rowData.put("over_due", (rs.getString("OVER_DUE"))); rowData.put("over_due", checkDouble (rs.getString("OVER_DUE")).trim());
rowData.put("avg_delay", checkDouble(rs.getString("AVG_DELAY"))); rowData.put("avg_delay", checkDouble(rs.getString("AVG_DELAY")).trim());
rowData.put("circledisplay", "c100"); rowData.put("circledisplay", "c100");
/*Calculate percentage*/ /*Calculate percentage*/
double delayTime = Double.parseDouble(checkDouble(rs.getString("DELAY_TIME")).trim()); double delayTime = Double.parseDouble(checkDouble(rs.getString("DELAY_TIME")).trim());
...@@ -207,7 +208,31 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -207,7 +208,31 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataShpmentEffiJson.put(count, rowData); rawDataShpmentEffiJson.put(count, rowData);
count++; count++;
} }
//Add code for initialisation variable as default code
if(!isRreturnValue)
{
System.out.println("Execute Default condition when SQL not Execute");
rowData = new JSONObject();
rowData.put("total_order", "0");
rowData.put("on_time", "0");
rowData.put("delay_time", "0");
rowData.put("over_due", "0");
rowData.put("avg_delay", "0.0");
rowData.put("circledisplay", "c100");
/*Calculate percentage*/
double delayTime = 0.0;
double onTime = 0.0;
double totalTime = delayTime + onTime;
percentage = 0;
rowData.put("percentage", "0");
rowData.put("spanvalue", "0 %");
rowData.put("dashOffSet", "0");
rowData.put("total_time", ""+totalTime);
rawDataShpmentEffiJson.put(count, rowData);
System.out.println("Execute Default condition Efficiency Summary==="+rawDataShpmentEffiJson.toString());
count++;
}
//End code for initialisation variable as default code
} }
}catch (Exception e) }catch (Exception e)
{ {
...@@ -263,7 +288,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -263,7 +288,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
boolean isReturnValue=false;
try try
{ {
System.out.println("********** In WMS3PLSummDtlDashboard : getShipmentEffDet Method ****************** "); System.out.println("********** In WMS3PLSummDtlDashboard : getShipmentEffDet Method ****************** ");
...@@ -397,14 +422,15 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -397,14 +422,15 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
while(rs.next()) while(rs.next())
{ {
isReturnValue =true;
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim()); rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim());
rowData.put("site_descr", checkNull(rs.getString("site_descr")).trim()); rowData.put("site_descr", checkNull(rs.getString("site_descr")).trim());
rowData.put("total_order", rs.getString("TOTAL_ORDER")); rowData.put("total_order", checkDouble(rs.getString("TOTAL_ORDER")).trim());
rowData.put("on_time", rs.getString("ON_TIME")); rowData.put("on_time", checkDouble(rs.getString("ON_TIME")).trim());
rowData.put("delay_time", checkDouble(rs.getString("DELAY_TIME"))); rowData.put("delay_time", checkDouble(rs.getString("DELAY_TIME")).trim());
rowData.put("over_due", rs.getString("OVER_DUE")); rowData.put("over_due", checkDouble(rs.getString("OVER_DUE")).trim());
rowData.put("avg_delay", checkDouble(rs.getString("AVG_DELAY"))); rowData.put("avg_delay", checkDouble(rs.getString("AVG_DELAY")).trim());
rowData.put("circledisplay", "c100"); rowData.put("circledisplay", "c100");
/*Calculate percentage*/ /*Calculate percentage*/
double delayTime = Double.parseDouble(checkDouble(rs.getString("DELAY_TIME")).trim()); double delayTime = Double.parseDouble(checkDouble(rs.getString("DELAY_TIME")).trim());
...@@ -419,6 +445,34 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -419,6 +445,34 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataShpmentEffiJson.put(count, rowData); rawDataShpmentEffiJson.put(count, rowData);
count++; count++;
} }
//Add code for initialisation variable as default code
if(!isReturnValue)
{
rowData = new JSONObject();
rowData.put("site_code", "");
rowData.put("site_descr", "");
rowData.put("total_order", "0");
rowData.put("on_time", "0");
rowData.put("delay_time", "0");
rowData.put("over_due", "0");
rowData.put("avg_delay", "0.0");
rowData.put("circledisplay", "c100");
/*Calculate percentage*/
double delayTime = 0.0;
double onTime = 0.0;
double totalTime = delayTime + onTime;
percentage = 0;
rowData.put("percentage", "0");
rowData.put("spanvalue", "0 %");
rowData.put("dashOffSet", "0");
rowData.put("total_time", ""+totalTime);
rawDataShpmentEffiJson.put(count, rowData);
count++;
System.out.println("Execute Default Efficience Details==="+rawDataShpmentEffiJson.toString());
}
//End code for initialisation variable as default code
} }
}catch (Exception e) }catch (Exception e)
...@@ -474,6 +528,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -474,6 +528,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
boolean isRreturnValue=false;
try try
{ {
...@@ -598,21 +653,21 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -598,21 +653,21 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
while(rs.next()) while(rs.next())
{ {
isRreturnValue=true;
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim());
rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim()); rowData.put("total_order", checkDouble(rs.getString("TOTAL_ORDER")));
rowData.put("total_order", rs.getString("TOTAL_ORDER")); rowData.put("past_due_date", checkDouble(rs.getString("PAST_DUE_DATE")));
rowData.put("past_due_date", rs.getString("PAST_DUE_DATE")); rowData.put("pending_item", checkDouble(rs.getString("PENDING_ITEM")));
rowData.put("pending_item", rs.getString("PENDING_ITEM")); rowData.put("on_hold", checkDouble(rs.getString("ON_HOLD")));
rowData.put("on_hold", rs.getString("ON_HOLD")); rowData.put("initialshipment",checkDouble(rs.getString("INITIALSHIPMENT")));
rowData.put("initialshipment", rs.getString("INITIALSHIPMENT")); rowData.put("totalskuorder", checkDouble(rs.getString("TOTALSKUORDER")));
rowData.put("totalskuorder", rs.getString("TOTALSKUORDER")); rowData.put("sku_fill_rate", checkDouble(rs.getString("SKU_FILL_RATE")));
rowData.put("sku_fill_rate", rs.getString("SKU_FILL_RATE")); rowData.put("wip", checkDouble(rs.getString("WIP")));
rowData.put("wip", rs.getString("WIP"));
rowData.put("circledisplay", "c100"); rowData.put("circledisplay", "c100");
/*Calculate percentage*/ /*Calculate percentage*/
percentage = Double.parseDouble(rs.getString("SKU_FILL_RATE")); percentage = Double.parseDouble(checkDouble(rs.getString("SKU_FILL_RATE")));
rowData.put("percentage", percentage); rowData.put("percentage", percentage);
rowData.put("spanvalue", percentage+"%"); rowData.put("spanvalue", percentage+"%");
if(percentage != 0.0) if(percentage != 0.0)
...@@ -625,7 +680,33 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -625,7 +680,33 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataShpmentEffiJson.put(count, rowData); rawDataShpmentEffiJson.put(count, rowData);
count++; count++;
} }
} //Add code for initialisation variable as default code
if(!isRreturnValue)
{
rowData = new JSONObject();
rowData.put("site_code", "");
rowData.put("total_order", "0");
rowData.put("past_due_date","0");
rowData.put("pending_item", "0");
rowData.put("on_hold", "0");
rowData.put("initialshipment","0");
rowData.put("totalskuorder", "0");
rowData.put("sku_fill_rate","0");
rowData.put("wip", "0");
rowData.put("circledisplay", "c100");
/*Calculate percentage*/
percentage = 0.0;
rowData.put("percentage", percentage);
rowData.put("spanvalue", percentage+"%");
rowData.put("dashOffSet", "0");
rawDataShpmentEffiJson.put(count, rowData);
count++;
System.out.println("Execute Default condition for SKU fill Summary1"+rawDataShpmentEffiJson);
System.out.println("Execute Default condition for SKU fill Summary2"+rawDataShpmentEffiJson.toString());
}
//End code for initialisation variable as default code
}
}catch (Exception e) }catch (Exception e)
{ {
...@@ -681,7 +762,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -681,7 +762,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
boolean isRreturnValue=false;
try try
{ {
System.out.println("********** In WMS3PLSummDtlDashboard : getSkuFillRateDet Method ****************** "); System.out.println("********** In WMS3PLSummDtlDashboard : getSkuFillRateDet Method ****************** ");
...@@ -792,23 +873,21 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -792,23 +873,21 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
while(rs.next()) while(rs.next())
{ {
isRreturnValue=true;
rowData = new JSONObject(); rowData = new JSONObject();
rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim());
rowData.put("site_code", checkNull(rs.getString("SITE_CODE")).trim()); rowData.put("site_descr", checkNull(rs.getString("site_descr")).trim());
rowData.put("site_descr", checkNull(rs.getString("site_descr")).trim()); rowData.put("total_order", checkDouble(rs.getString("TOTAL_ORDER")).trim());
rowData.put("total_order", checkNull(rs.getString("TOTAL_ORDER")).trim()); rowData.put("past_due_date", checkDouble(rs.getString("PAST_DUE_DATE")).trim());
rowData.put("past_due_date", checkNull(rs.getString("PAST_DUE_DATE")).trim()); rowData.put("pending_item", checkDouble(rs.getString("PENDING_ITEM")).trim());
rowData.put("pending_item", checkNull(rs.getString("PENDING_ITEM")).trim()); rowData.put("on_hold", checkDouble(rs.getString("ON_HOLD")).trim());
rowData.put("on_hold", checkNull(rs.getString("ON_HOLD")).trim()); rowData.put("initialshipment",checkDouble(rs.getString("INITIALSHIPMENT")).trim());
rowData.put("initialshipment", checkNull(rs.getString("INITIALSHIPMENT")).trim()); rowData.put("totalskuorder", checkDouble(rs.getString("TOTALSKUORDER")).trim());
rowData.put("totalskuorder", checkNull(rs.getString("TOTALSKUORDER")).trim()); rowData.put("sku_fill_rate", checkDouble(rs.getString("SKU_FILL_RATE")).trim());
rowData.put("sku_fill_rate", checkNull(rs.getString("SKU_FILL_RATE")).trim()); rowData.put("wip", checkDouble(rs.getString("WIP")).trim());
rowData.put("wip", checkNull(rs.getString("WIP")).trim()); rowData.put("circledisplay", "c100");
rowData.put("circledisplay", "c100");
/*Calculate percentage*/ /*Calculate percentage*/
percentage = Double.parseDouble(checkDouble(rs.getString("SKU_FILL_RATE")));
percentage = Double.parseDouble(rs.getString("SKU_FILL_RATE"));
rowData.put("percentage", percentage); rowData.put("percentage", percentage);
rowData.put("spanvalue", percentage+"%"); rowData.put("spanvalue", percentage+"%");
if(percentage != 0.0) if(percentage != 0.0)
...@@ -821,7 +900,31 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -821,7 +900,31 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataShpmentEffiJson.put(count, rowData); rawDataShpmentEffiJson.put(count, rowData);
count++; count++;
} }
} //Add code for initialisation variable as default code
if(!isRreturnValue)
{
rowData = new JSONObject();
rowData.put("site_code", "");
rowData.put("site_descr", "");
rowData.put("total_order", "0");
rowData.put("past_due_date","0");
rowData.put("pending_item","0");
rowData.put("on_hold", "0");
rowData.put("initialshipment","0");
rowData.put("totalskuorder","0");
rowData.put("sku_fill_rate","0");
rowData.put("wip", "0");
rowData.put("circledisplay","c100");
/*Calculate percentage*/
percentage = 0.0;
rowData.put("percentage", percentage);
rowData.put("spanvalue", percentage+"%");
rowData.put("dashOffSet", "0");
rawDataShpmentEffiJson.put(count, rowData);
count++;
}
//End code for initialisation variable as default code
}
}catch (Exception e) }catch (Exception e)
{ {
...@@ -4865,7 +4968,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -4865,7 +4968,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackJson.put(count, rawJson); rawDataOrderStatusSummStackJson.put(count, rawJson);
count++; count++;
...@@ -5264,7 +5367,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -5264,7 +5367,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackJson.put(count, rawJson); rawDataOrderStatusSummStackJson.put(count, rawJson);
count++; count++;
...@@ -5683,7 +5786,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -5683,7 +5786,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
...@@ -6022,7 +6125,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -6022,7 +6125,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
...@@ -6315,7 +6418,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -6315,7 +6418,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackValWiseJson.put(count, rawJson); rawDataOrderStatusSummStackValWiseJson.put(count, rawJson);
count++; count++;
...@@ -6711,7 +6814,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -6711,7 +6814,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackJson.put(count, rawJson); rawDataOrderStatusSummStackJson.put(count, rawJson);
count++; count++;
...@@ -7107,7 +7210,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7107,7 +7210,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieValJson.put(count, rawJson); rawDataOrderStatusSummPieValJson.put(count, rawJson);
count++; count++;
...@@ -7442,7 +7545,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7442,7 +7545,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
...@@ -7744,7 +7847,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -7744,7 +7847,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackJson.put(count, rawJson); rawDataOrderStatusSummStackJson.put(count, rawJson);
count++; count++;
...@@ -8152,7 +8255,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8152,7 +8255,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
catValues.put("Exception", ""); catValues.put("Exception", "");
rawJson.put("date",count); rawJson.put("date",count);
rawJson.put("status","Priors"); rawJson.put("status","Prior Months");
rawJson.put("category_value",catValues); rawJson.put("category_value",catValues);
rawDataOrderStatusSummStackJson.put(count, rawJson); rawDataOrderStatusSummStackJson.put(count, rawJson);
count++; count++;
...@@ -8559,7 +8662,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8559,7 +8662,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
...@@ -8687,6 +8790,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8687,6 +8790,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
long stockOut = 0; long stockOut = 0;
long prvOpenOrder = 0; long prvOpenOrder = 0;
long priorOpenOrder = 0; long priorOpenOrder = 0;
boolean returnValue = false;
try try
{ {
...@@ -8865,6 +8969,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8865,6 +8969,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rs= pstmt.executeQuery(); rs= pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
returnValue = true;
rawDataOrderStatusSummPieJson = new JSONObject(); rawDataOrderStatusSummPieJson = new JSONObject();
count = 0; count = 0;
...@@ -8910,7 +9015,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -8910,7 +9015,7 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
rawJson = new JSONObject(); rawJson = new JSONObject();
rawJson.put("status", "Priors"); rawJson.put("status", "Prior Months");
rawJson.put("value", rs.getString("PriorOpenOrder")); rawJson.put("value", rs.getString("PriorOpenOrder"));
rawDataOrderStatusSummPieJson.put(count, rawJson); rawDataOrderStatusSummPieJson.put(count, rawJson);
count++; count++;
...@@ -9094,9 +9199,9 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt ...@@ -9094,9 +9199,9 @@ public class WMS3PLSummDtlDashboard extends ValidatorEJB implements WMS3PLSummDt
System.out.println("************ in Previous Month ********** "); System.out.println("************ in Previous Month ********** ");
appendDynamicSql = " and so.status not in ('C','X') and so.site_code='"+siteCode+"' and so.CONF_DATE between '"+prvMonthFrmDate+"' and '"+prvMonthToDate+"' "; appendDynamicSql = " and so.status not in ('C','X') and so.site_code='"+siteCode+"' and so.CONF_DATE between '"+prvMonthFrmDate+"' and '"+prvMonthToDate+"' ";
}else if(productCategory.equalsIgnoreCase("Priors")) }else if(productCategory.equalsIgnoreCase("Prior Months"))
{ {
System.out.println("************ in Priors ********** "); System.out.println("************ in Prior Months ********** ");
appendDynamicSql = " and so.status not in ('C','X') and so.site_code='"+siteCode+"' and so.CONF_DATE < '"+prvMonthFrmDate+"' "; appendDynamicSql = " and so.status not in ('C','X') and so.site_code='"+siteCode+"' and so.CONF_DATE < '"+prvMonthFrmDate+"' ";
}else if(productCategory.equalsIgnoreCase("Shipped")) }else if(productCategory.equalsIgnoreCase("Shipped"))
......
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