Skip to content

B
business-java
Commit 80ff68a1 authored by psawant's avatar psawant
Browse files
Options

In Sales Order Side Panel Status 

-Added for the Unconfirmed Status

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@194297 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8967a4db
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 51 deletions
webitm-dis/ibase/webitm/ejb/dis/SorderStatusEJB.java
View file @ 80ff68a1
......@@ -32,7 +32,8 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
String asCustCodeBil="",asItemSer="",asSorder="",asSiteCode="";
Timestamp adtTranDate=null;
String pordDate = "", orderDate = "",maxDate = "", minDate = "",despDate = "",tranDate = "";
String pordDate1 = "",orderDate1="",minDate1="",maxDate1="",despDate1 = "",tranDate1="";
//Added by Pooja S on[11-12-2018] for the Unconfirmed Status
String pordDate1 = "",orderDate1="",minDate1="",maxDate1="",despDate1 = "",tranDate1="",despqty="",confirmed="";
double adNetAmt = 0.0;
int cnt = 0;
HashMap<String,Object> sordData = null;
......@@ -185,6 +186,8 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
minDate = rs1.getString("MIN_DUE_DATE");
maxDate = rs1.getString("MAX_DUE_DATE");
asItemSer = rs1.getString("ITEM_SER");
//Added by Pooja S on[11-12-2018] for the Unconfirmed Status
confirmed = rs1.getString("CONFIRMED");
System.out.println("pordDate ::"+pordDate +"\t" +"orderDate ::"+orderDate + "minDate ::"+minDate +"maxDate ::"+maxDate);
if(pordDate != null)
......@@ -308,55 +311,110 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
"SORDDET.LINE_NO,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP," +
"SORDITEM.PLAN_PROD_DATE,SORDITEM.REMARKS,SORDDET.DSP_DATE,SORDITEM.EXP_DLV_DATE " +
"ORDER BY SORDDET.LINE_NO ASC, SORDITEM.EXP_LEV ASC";*/
sql = "SELECT SORDITEM.SALE_ORDER,SORDITEM.ITEM_CODE,SORDITEM.LINE_NO,SORDITEM.EXP_LEV ," +
"SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY," +
"SORDITEM.UNIT,SORDITEM.QTY_ALLOC,SORDITEM.DATE_ALLOC,SORDITEM.NATURE,SORDITEM.REAS_CODE," +
"SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.STATUS,SORDITEM.PLAN_PROD_DATE,SORDITEM.EXP_DLV_DATE," +
"SORDITEM.REMARKS,SORDITEM.DUE_DATE,(SELECT SUM(QUANTITY - ALLOC_QTY - CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) " +
"FROM STOCK,LOCATION,INVSTAT WHERE STOCK.ITEM_CODE = SORDITEM.ITEM_CODE AND STOCK.SITE_CODE = SORDITEM.SITE_CODE " +
"AND LOCATION.LOC_CODE=STOCK.LOC_CODE AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND INVSTAT.AVAILABLE= 'Y') STK_QTY, " +
"(SORDITEM.QUANTITY - SORDITEM.qty_desp) AS PEND_QTY FROM SORDITEM, ITEM WHERE (SORDITEM.ITEM_CODE = item.ITEM_CODE) " +
"AND SORDITEM.SALE_ORDER = ? GROUP BY SORDITEM.SALE_ORDER,SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.EXP_LEV," +
"SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,SORDITEM.DATE_ALLOC,SORDITEM.QTY_ALLOC,SORDITEM.STATUS,SORDITEM.NATURE," +
"SORDITEM.LINE_NO,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.PLAN_PROD_DATE,SORDITEM.REMARKS," +
"SORDitem.due_DATE,SORDITEM.EXP_DLV_DATE ORDER BY SORDITEM.LINE_NO ASC, SORDITEM.EXP_LEV ASC";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
while(rs.next())
{
/*despDate = rs.getString("DSP_DATE");
//Added by Pooja S on[11-12-2018] for the Unconfirmed Status
if("N".equalsIgnoreCase(confirmed))
{
sql="SELECT SORDITEM.SALE_ORDER,SORDITEM.DSP_DATE,SORDITEM.LINE_NO ,SORDITEM.SITE_CODE,SORDITEM.ITEM_CODE,"
+ "ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,SORDITEM.NATURE,"
+ "SORDITEM.STATUS,SORDITEM.REMARKS,"
+ "(SELECT SUM(QUANTITY - ALLOC_QTY - CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) FROM STOCK,LOCATION,INVSTAT"
+ " WHERE STOCK.ITEM_CODE = SORDITEM.ITEM_CODE AND STOCK.SITE_CODE = SORDITEM.SITE_CODE AND LOCATION.LOC_CODE=STOCK.LOC_CODE"
+ " AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND INVSTAT.AVAILABLE= 'Y') STK_QTY, (SORDITEM.QUANTITY) AS PEND_QTY "
+ "FROM SORDDET SORDITEM, ITEM WHERE (SORDITEM.ITEM_CODE = item.ITEM_CODE) AND SORDITEM.SALE_ORDER = ?"
+ "GROUP BY SORDITEM.SALE_ORDER,"
+ "SORDITEM.SITE_CODE,SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,"
+ "SORDITEM.STATUS,SORDITEM.NATURE,SORDITEM.LINE_NO,"
+ " SORDITEM.REMARKS,SORDITEM.DSP_DATE ORDER BY SORDITEM.LINE_NO ASC";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
while(rs.next())
{
despqty="0";
despDate = rs.getString("DSP_DATE");
if(despDate != null)
{
despDate1 = genericUtility.getValidDateString(despDate, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}
valueXmlString.append("<Item>\n");
valueXmlString.append("<sale_order><![CDATA["+checkNull(rs.getString("SALE_ORDER"))+"]]></sale_order>\n");
valueXmlString.append("<line_no><![CDATA["+checkNull(rs.getString("LINE_NO"))+"]]></line_no>\n");
valueXmlString.append("<item_code><![CDATA["+checkNull(rs.getString("ITEM_CODE"))+"]]></item_code>\n");
valueXmlString.append("<item_descr><![CDATA["+checkNull(rs.getString("DESCR"))+"]]></item_descr>\n");
valueXmlString.append("<quantity><![CDATA["+checkNull(rs.getString("QUANTITY"))+"]]></quantity>\n");
valueXmlString.append("<unit><![CDATA["+checkNull(rs.getString("UNIT"))+"]]></unit>\n");
//valueXmlString.append("<date_alloc><![CDATA["+checkNull(rs.getString("DATE_ALLOC"))+"]]></date_alloc>\n");
//valueXmlString.append("<qty_alloc><![CDATA["+checkNull(rs.getString("QTY_ALLOC"))+"]]></qty_alloc>\n");
valueXmlString.append("<status><![CDATA["+checkNull(rs.getString("STATUS"))+"]]></status>\n");
valueXmlString.append("<nature><![CDATA["+checkNull(rs.getString("NATURE"))+"]]></nature>\n");
//valueXmlString.append("<read_code><![CDATA["+checkNull(rs.getString("REAS_CODE"))+"]]></read_code>\n");
//valueXmlString.append("<reas_detail><![CDATA["+checkNull(rs.getString("REAS_DETAIL"))+"]]></reas_detail>\n");
valueXmlString.append("<desp_qty><![CDATA["+ despqty +"]]></desp_qty>\n");
//valueXmlString.append("<plan_prod_date><![CDATA["+checkNull(rs.getString("PLAN_PROD_DATE"))+"]]></plan_prod_date>\n");
valueXmlString.append("<remarks><![CDATA["+checkNull(rs.getString("REMARKS"))+"]]></remarks>\n");
valueXmlString.append("<dsp_date><![CDATA["+despDate1+"]]></dsp_date>\n");
//valueXmlString.append("<exp_dlv_date><![CDATA["+checkNull(rs.getString("EXP_DLV_DATE"))+"]]></exp_dlv_date>\n");
valueXmlString.append("<pend_qty><![CDATA["+checkNull(rs.getString("PEND_QTY"))+"]]></pend_qty>\n");
valueXmlString.append("<stk_qty><![CDATA["+checkNull(rs.getString("STK_QTY"))+"]]></stk_qty>\n");
valueXmlString.append("</Item>");
}
}
else
{
sql = "SELECT SORDITEM.SALE_ORDER,SORDITEM.ITEM_CODE,SORDITEM.LINE_NO,SORDITEM.EXP_LEV ," +
"SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY," +
"SORDITEM.UNIT,SORDITEM.QTY_ALLOC,SORDITEM.DATE_ALLOC,SORDITEM.NATURE,SORDITEM.REAS_CODE," +
"SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.STATUS,SORDITEM.PLAN_PROD_DATE,SORDITEM.EXP_DLV_DATE," +
"SORDITEM.REMARKS,SORDITEM.DUE_DATE,(SELECT SUM(QUANTITY - ALLOC_QTY - CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) " +
"FROM STOCK,LOCATION,INVSTAT WHERE STOCK.ITEM_CODE = SORDITEM.ITEM_CODE AND STOCK.SITE_CODE = SORDITEM.SITE_CODE " +
"AND LOCATION.LOC_CODE=STOCK.LOC_CODE AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND INVSTAT.AVAILABLE= 'Y') STK_QTY, " +
"(SORDITEM.QUANTITY - SORDITEM.qty_desp) AS PEND_QTY FROM SORDITEM, ITEM WHERE (SORDITEM.ITEM_CODE = item.ITEM_CODE) " +
"AND SORDITEM.SALE_ORDER = ? GROUP BY SORDITEM.SALE_ORDER,SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.EXP_LEV," +
"SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,SORDITEM.DATE_ALLOC,SORDITEM.QTY_ALLOC,SORDITEM.STATUS,SORDITEM.NATURE," +
"SORDITEM.LINE_NO,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.PLAN_PROD_DATE,SORDITEM.REMARKS," +
"SORDitem.due_DATE,SORDITEM.EXP_DLV_DATE ORDER BY SORDITEM.LINE_NO ASC, SORDITEM.EXP_LEV ASC";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
while(rs.next())
{
//Changed by Pooja S on[11-12-2018] for the Unconfirmed Status
despDate = rs.getString("DUE_DATE");
if(despDate != null)
{
despDate1 = genericUtility.getValidDateString(despDate, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
}*/
valueXmlString.append("<Item>\n");
valueXmlString.append("<sale_order><![CDATA["+checkNull(rs.getString("SALE_ORDER"))+"]]></sale_order>\n");
valueXmlString.append("<line_no><![CDATA["+checkNull(rs.getString("LINE_NO"))+"]]></line_no>\n");
valueXmlString.append("<exp_lev><![CDATA["+checkNull(rs.getString("EXP_LEV"))+"]]></exp_lev>\n");
//valueXmlString.append("<item_code__ord><![CDATA["+checkNull(rs.getString("ITEM_CODE__ORD"))+"]]></item_code__ord>\n");
valueXmlString.append("<item_flag><![CDATA["+checkNull(rs.getString("ITEM_FLAG"))+"]]></item_flag>\n");
valueXmlString.append("<item_code><![CDATA["+checkNull(rs.getString("ITEM_CODE"))+"]]></item_code>\n");
valueXmlString.append("<item_descr><![CDATA["+checkNull(rs.getString("DESCR"))+"]]></item_descr>\n");
valueXmlString.append("<quantity><![CDATA["+checkNull(rs.getString("QUANTITY"))+"]]></quantity>\n");
valueXmlString.append("<unit><![CDATA["+checkNull(rs.getString("UNIT"))+"]]></unit>\n");
valueXmlString.append("<date_alloc><![CDATA["+checkNull(rs.getString("DATE_ALLOC"))+"]]></date_alloc>\n");
valueXmlString.append("<qty_alloc><![CDATA["+checkNull(rs.getString("QTY_ALLOC"))+"]]></qty_alloc>\n");
valueXmlString.append("<status><![CDATA["+checkNull(rs.getString("STATUS"))+"]]></status>\n");
valueXmlString.append("<nature><![CDATA["+checkNull(rs.getString("NATURE"))+"]]></nature>\n");
valueXmlString.append("<read_code><![CDATA["+checkNull(rs.getString("REAS_CODE"))+"]]></read_code>\n");
valueXmlString.append("<reas_detail><![CDATA["+checkNull(rs.getString("REAS_DETAIL"))+"]]></reas_detail>\n");
valueXmlString.append("<desp_qty><![CDATA["+checkNull(rs.getString("QTY_DESP"))+"]]></desp_qty>\n");
valueXmlString.append("<plan_prod_date><![CDATA["+checkNull(rs.getString("PLAN_PROD_DATE"))+"]]></plan_prod_date>\n");
valueXmlString.append("<remarks><![CDATA["+checkNull(rs.getString("REMARKS"))+"]]></remarks>\n");
//valueXmlString.append("<dsp_date><![CDATA["+despDate1+"]]></dsp_date>\n");
valueXmlString.append("<exp_dlv_date><![CDATA["+checkNull(rs.getString("EXP_DLV_DATE"))+"]]></exp_dlv_date>\n");
valueXmlString.append("<pend_qty><![CDATA["+checkNull(rs.getString("PEND_QTY"))+"]]></pend_qty>\n");
valueXmlString.append("<stk_qty><![CDATA["+checkNull(rs.getString("STK_QTY"))+"]]></stk_qty>\n");
valueXmlString.append("</Item>");
}
}
valueXmlString.append("<Item>\n");
valueXmlString.append("<sale_order><![CDATA["+checkNull(rs.getString("SALE_ORDER"))+"]]></sale_order>\n");
valueXmlString.append("<line_no><![CDATA["+checkNull(rs.getString("LINE_NO"))+"]]></line_no>\n");
valueXmlString.append("<exp_lev><![CDATA["+checkNull(rs.getString("EXP_LEV"))+"]]></exp_lev>\n");
//valueXmlString.append("<item_code__ord><![CDATA["+checkNull(rs.getString("ITEM_CODE__ORD"))+"]]></item_code__ord>\n");
valueXmlString.append("<item_flag><![CDATA["+checkNull(rs.getString("ITEM_FLAG"))+"]]></item_flag>\n");
valueXmlString.append("<item_code><![CDATA["+checkNull(rs.getString("ITEM_CODE"))+"]]></item_code>\n");
valueXmlString.append("<item_descr><![CDATA["+checkNull(rs.getString("DESCR"))+"]]></item_descr>\n");
valueXmlString.append("<quantity><![CDATA["+checkNull(rs.getString("QUANTITY"))+"]]></quantity>\n");
valueXmlString.append("<unit><![CDATA["+checkNull(rs.getString("UNIT"))+"]]></unit>\n");
valueXmlString.append("<date_alloc><![CDATA["+checkNull(rs.getString("DATE_ALLOC"))+"]]></date_alloc>\n");
valueXmlString.append("<qty_alloc><![CDATA["+checkNull(rs.getString("QTY_ALLOC"))+"]]></qty_alloc>\n");
valueXmlString.append("<status><![CDATA["+checkNull(rs.getString("STATUS"))+"]]></status>\n");
valueXmlString.append("<nature><![CDATA["+checkNull(rs.getString("NATURE"))+"]]></nature>\n");
valueXmlString.append("<read_code><![CDATA["+checkNull(rs.getString("REAS_CODE"))+"]]></read_code>\n");
valueXmlString.append("<reas_detail><![CDATA["+checkNull(rs.getString("REAS_DETAIL"))+"]]></reas_detail>\n");
valueXmlString.append("<desp_qty><![CDATA["+checkNull(rs.getString("QTY_DESP"))+"]]></desp_qty>\n");
valueXmlString.append("<plan_prod_date><![CDATA["+checkNull(rs.getString("PLAN_PROD_DATE"))+"]]></plan_prod_date>\n");
valueXmlString.append("<remarks><![CDATA["+checkNull(rs.getString("REMARKS"))+"]]></remarks>\n");
valueXmlString.append("<dsp_date><![CDATA["+despDate1+"]]></dsp_date>\n");
valueXmlString.append("<exp_dlv_date><![CDATA["+checkNull(rs.getString("EXP_DLV_DATE"))+"]]></exp_dlv_date>\n");
valueXmlString.append("<pend_qty><![CDATA["+checkNull(rs.getString("PEND_QTY"))+"]]></pend_qty>\n");
valueXmlString.append("<stk_qty><![CDATA["+checkNull(rs.getString("STK_QTY"))+"]]></stk_qty>\n");
valueXmlString.append("</Item>");
}
}
if(rs != null)
{
rs.close();
......
webitm-dis/module-resource/xsl/sorder_status11_en_US_V.xsl
View file @ 80ff68a1
......@@ -24,16 +24,17 @@
<div class="orderStatsDiv">
<input type="hidden" value="{$orderStatus}" id="orderStatus"/>
<xsl:if test="$orderStatus='H'">
<span>Sales order is on hold</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderHold.png" />
<!-- Changed by Pooja S on[11-12-2018] for the Unconfirmed Status -->
<span>Order is on hold</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderHold.png" />
</xsl:if>
<xsl:if test="$orderStatus='P'">
<span>Sales order is pending</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderPending.png" />
<span>Order is not confirmed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderPending.png" />
</xsl:if>
<xsl:if test="$orderStatus='C'">
<span>Sales order is closed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderClosed.png" />
<span>Order is closed</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderClosed.png" />
</xsl:if>
<xsl:if test="$orderStatus='X'">
<span>Sales order is cancelled</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderCancel.png" />
<span>Order is cancelled</span><img class="orderStatsImg" src="/ibase/images/galaxy/orderCancel.png" />
</xsl:if>
</div>
</div>
......@@ -149,6 +150,46 @@
</xsl:if>
</div>
</xsl:when>
<!-- Added by Pooja S on[11-12-2018] for the Unconfirmed Status -->
<xsl:when test="$lineStatus='N'">
<div class='pendDueDtLblDiv'>
<div class='pendQtyDiv'>
<xsl:value-of select="pend_qty"/>&#160;<xsl:value-of select="unit"/>
Pending
</div>
<div class='dueDateLbl'>
Due on
</div>
</div>
<div class='shipQtyDueDtDiv'>
<div class='shipQtyDiv'>
<xsl:if test="$despQty='' or $despQty='0'">
Not shipped
</xsl:if>
<xsl:if test="$despQty=not('') and $despQty=not('0')">
<xsl:value-of select="desp_qty"/>&#160;<xsl:value-of select="unit"/>
Shipped
</xsl:if>
<xsl:if test="$reasDtl=not('') and $reasDtl=not('0')">
<xsl:value-of select="reas_detail"/>&#160;<xsl:value-of select="unit"/>
</xsl:if>
</div>
<div class='dueDate'>
<xsl:value-of select="dsp_date"/>
</div>
</div>
<div class='stkQtyDiv'>
<xsl:if test="$stkQty='' or $stkQty='0'">
No stock available
</xsl:if>
<xsl:if test="$stkQty=not('')">
<xsl:value-of select="stk_qty"/>&#160;<xsl:value-of select="unit"/>
in stock
</xsl:if>
</div>
</xsl:when>
<xsl:otherwise>
<div class='closeOrderQtyDiv'>
......
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