Skip to content

B
business-java
Commit 70f5c94e authored by steurwadkar's avatar steurwadkar
Browse files
Options

Changes made to generate wave task from distribution order 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182844 ce508802-f39f-4f6c-b175-0d175dae99d5
parent db07ecc7
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/WavegenWizEJB.java
View file @ 70f5c94e
......@@ -176,6 +176,7 @@ public class WavegenWizEJB extends ValidatorEJB implements WavegenWizEJBLocal, W
valueXmlString.append("<Detail2 domID='0'>");
valueXmlString.append("<site_code><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("site_code", dom1))).append( "]]></site_code>");
valueXmlString.append("<sort_order><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("sort_order", dom1))).append( "]]></sort_order>");
valueXmlString.append("<wave_on><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("wave_on", dom1))).append( "]]></wave_on>");
valueXmlString.append("<item_ser__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("item_ser__from", dom1))).append( "]]></item_ser__from>");
valueXmlString.append("<item_ser__to><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("item_ser__to", dom1))).append( "]]></item_ser__to>");
valueXmlString.append("<product_style__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("product_style__from", dom1))).append( "]]></product_style__from>");
......@@ -188,6 +189,8 @@ public class WavegenWizEJB extends ValidatorEJB implements WavegenWizEJBLocal, W
valueXmlString.append("<due_date__to><![CDATA[").append( checkNull(e12genericUtility.getColumnValue("due_date__to", dom1)) ).append( "]]></due_date__to>");
valueXmlString.append("<sale_order__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("sale_order__from", dom1))).append( "]]></sale_order__from>");
valueXmlString.append("<sale_order__to><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("sale_order__to", dom1))).append( "]]></sale_order__to>");
valueXmlString.append("<dist_order__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("dist_order__from", dom1))).append( "]]></dist_order__from>");
valueXmlString.append("<dist_order__to><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("dist_order__to", dom1))).append( "]]></dist_order__to>");
valueXmlString.append("<cust_code__dlv__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("cust_code__dlv__from", dom1))).append( "]]></cust_code__dlv__from>");
valueXmlString.append("<cust_code__dlv__to><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("cust_code__dlv__to", dom1))).append( "]]></cust_code__dlv__to>");
valueXmlString.append("<credit_term__from><![CDATA[").append(checkNull(e12genericUtility.getColumnValue("credit_term__from", dom1))).append( "]]></credit_term__from>");
......
webitm-wms/ibase/webitm/ejb/wms/WavegenWizPos.java
View file @ 70f5c94e
......@@ -170,11 +170,11 @@ public class WavegenWizPos extends ValidatorEJB implements WavegenWizPosLocal, W
summaryStrBuff.append("<root>");
sql = " SELECT WAVE_TASK_DET.WAVE_ID,WAVE_TASK_DET.LINE_NO,WAVE_TASK_DET.REF_SER,WAVE_TASK_DET.REF_ID,WAVE_TASK_DET.STATUS,"
sql = " SELECT WAVE_TASK.REF_SER AS TRAN_REF_SER, WAVE_TASK_DET.WAVE_ID,WAVE_TASK_DET.LINE_NO,WAVE_TASK_DET.REF_SER,WAVE_TASK_DET.REF_ID,WAVE_TASK_DET.STATUS,"
+ " WAVE_TASK_DET.PTCN,WAVE_TASK_DET.SALE_ORDER,WAVE_SEQ.PRIORITY,FN_WAVE_DESCRIPTION(WAVE_TASK_DET.REF_SER,WAVE_TASK_DET.REF_ID,"
+ " WAVE_TASK_DET.PTCN) AS DESCR,CASE WHEN WAVE_STATUS = 'C' THEN 'CREATED' WHEN WAVE_STATUS = 'V' THEN 'VERIFIED'"
+ " WHEN WAVE_STATUS = 'W' THEN 'HELD' WHEN WAVE_STATUS = 'D' THEN 'DEALLOCATED' ELSE ' ' END WAVE_STATUS"
+ " FROM WAVE_TASK_DET WAVE_TASK_DET,WAVE_SEQ WAVE_SEQ WHERE ( WAVE_TASK_DET.REF_SER=WAVE_SEQ.REF_SER(+)) AND"
+ " FROM WAVE_TASK WAVE_TASK, WAVE_TASK_DET WAVE_TASK_DET,WAVE_SEQ WAVE_SEQ WHERE WAVE_TASK.WAVE_ID=WAVE_TASK_DET.WAVE_ID AND ( WAVE_TASK_DET.REF_SER=WAVE_SEQ.REF_SER(+)) AND"
+ " WAVE_TASK_DET.WAVE_ID = ? ORDER BY WAVE_SEQ.PRIORITY ASC";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, waveID);
......@@ -184,7 +184,7 @@ public class WavegenWizPos extends ValidatorEJB implements WavegenWizPosLocal, W
while(rs.next())
{
isTaskGenerated = true;
summaryStrBuff.append("<summaryData domID='"+(++domID)+"'>");
summaryStrBuff.append("<summaryData domID='"+(++domID)+"' waveOn='"+checkNull(rs.getString("TRAN_REF_SER")).trim()+"'>");
summaryStrBuff.append("<wave_id><![CDATA["+checkNull(rs.getString("WAVE_ID"))+"]]></wave_id>");
summaryStrBuff.append("<line_no><![CDATA["+checkNull(rs.getString("LINE_NO"))+"]]></line_no>");
summaryStrBuff.append("<ref_ser><![CDATA["+checkNull(rs.getString("REF_SER"))+"]]></ref_ser>");
......
webitm-wms/module-resource/web/js/WavegenWiz.js
View file @ 70f5c94e
......@@ -1250,4 +1250,40 @@ function setActionVal(action)
{
document.getElementById("action").value = action;
}
//Added by Santosh on 31/03/2017 for reset button End
\ No newline at end of file
//Added by Santosh on 31/03/2017 for reset button End
function disableOrderFlds()
{
var waveOn = document.getElementById("Detail1.1.wave_on").value;
if("S" == waveOn)
{
var enableFields = ["item_ser__from", "item_ser__to", "sale_order__from", "sale_order__to", "order_type"];
var disableFields = ["dist_order__from", "dist_order__to"];
}
else if("D" == waveOn)
{
var disableFields = ["item_ser__from", "item_ser__to", "sale_order__from", "sale_order__to", "order_type"];
var enableFields = ["dist_order__from", "dist_order__to"];
}
for (var index in enableFields)
{
var eachField = enableFields[index];
var obj = document.getElementById("Detail1.1."+eachField);
obj.classList.remove("editDisplayClass");
obj.classList.add("input_editable");
obj.removeAttribute("disabled");
obj.removeAttribute("readonly");
}
for (var index in disableFields)
{
var eachField = disableFields[index];
var obj = document.getElementById("Detail1.1."+eachField);
obj.classList.remove("input_editable");
obj.classList.add("editDisplayClass");
obj.setAttribute("disabled","disabled");
obj.setAttribute("readonly","readonly");
}
}
\ No newline at end of file
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz1_wiz_en_US_A.xsl
View file @ 70f5c94e
......@@ -7,7 +7,7 @@
<html>
<body onload="formatDate();">
<body onload="formatDate();disableOrderFlds();">
<script type="text/javascript" src="/ibase/webitm/js/WavegenWiz.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-1.10.2.js"></script>
<script type="text/javascript" src="/ibase/webitm/js/jquery-ui-1.10.4.custom.min.js"></script>
......@@ -268,14 +268,14 @@
Distribution Order From:
</td>
<td class="td_leftAlign" >
<input type="text" class="editDisplayClass" value="{$dist_order__from}" name="Detail1.{normalize-space($dbID)}.dist_order__from" id="Detail1.{normalize-space($dbID)}.dist_order__from" onblur="callItemChange('dist_order__from');" popupFldName="DIST_ORDER__FROM" onkeyup="getAutoPopupData(this);" tabIndex="93" onfocus="displayPopUpIcon('popUpIcon18');" disabled="true" readonly="true"/>
<input type="text" class="input_editable" value="{$dist_order__from}" name="Detail1.{normalize-space($dbID)}.dist_order__from" id="Detail1.{normalize-space($dbID)}.dist_order__from" onblur="callItemChange('dist_order__from');" popupFldName="DIST_ORDER__FROM" onkeyup="getAutoPopupData(this);" tabIndex="93" onfocus="displayPopUpIcon('popUpIcon18');"/>
<a href="javascript:getListOfValues('DIST_ORDER__FROM','Detail1.{normalize-space($dbID)}.dist_order__from','{$site_code}');" id="popUpIcon18" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a>
</td>
<td class="td_rightAlign" nowrap="true" valign="middle" >
Distribution Order To:
</td>
<td class="td_leftAlign" >
<input type="text" class="editDisplayClass" value="{$dist_order__to}" name="Detail1.{normalize-space($dbID)}.dist_order__to" id="Detail1.{normalize-space($dbID)}.dist_order__to" onblur="callItemChange('dist_order__to');" popupFldName="DIST_ORDER__TO" onkeyup="getAutoPopupData(this);" tabIndex="98" onfocus="displayPopUpIcon('popUpIcon19');" disabled="true" readonly="true"/>
<input type="text" class="input_editable" value="{$dist_order__to}" name="Detail1.{normalize-space($dbID)}.dist_order__to" id="Detail1.{normalize-space($dbID)}.dist_order__to" onblur="callItemChange('dist_order__to');" popupFldName="DIST_ORDER__TO" onkeyup="getAutoPopupData(this);" tabIndex="98" onfocus="displayPopUpIcon('popUpIcon19');"/>
<a href="javascript:getListOfValues('DIST_ORDER__TO','Detail1.{normalize-space($dbID)}.dist_order__to','{$site_code}');" id="popUpIcon19" tabIndex="-1"><img src="/ibase/webitm/images/pophelp.png" /></a>
</td>
</tr>
......
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz2_wiz_en_US_A.xsl
View file @ 70f5c94e
......@@ -170,6 +170,7 @@
<xsl:variable name="site_code"><xsl:value-of select="site_code"/></xsl:variable>
<xsl:variable name="sort_order"><xsl:value-of select="sort_order"/></xsl:variable>
<xsl:variable name="wave_on"><xsl:value-of select="wave_on"/></xsl:variable>
<xsl:variable name="item_ser__from"><xsl:value-of select="item_ser__from"/></xsl:variable>
<xsl:variable name="item_ser__to"><xsl:value-of select="item_ser__to"/></xsl:variable>
<xsl:variable name="product_style__from"><xsl:value-of select="product_style__from"/></xsl:variable>
......@@ -182,6 +183,8 @@
<xsl:variable name="due_date__to"><xsl:value-of select="due_date__to"/></xsl:variable>
<xsl:variable name="sale_order__from"><xsl:value-of select="sale_order__from"/></xsl:variable>
<xsl:variable name="sale_order__to"><xsl:value-of select="sale_order__to"/></xsl:variable>
<xsl:variable name="dist_order__from"><xsl:value-of select="dist_order__from"/></xsl:variable>
<xsl:variable name="dist_order__to"><xsl:value-of select="dist_order__to"/></xsl:variable>
<xsl:variable name="cust_code__dlv__from"><xsl:value-of select="cust_code__dlv__from"/></xsl:variable>
<xsl:variable name="cust_code__dlv__to"><xsl:value-of select="cust_code__dlv__to"/></xsl:variable>
<xsl:variable name="credit_term__from"><xsl:value-of select="credit_term__from"/></xsl:variable>
......@@ -210,6 +213,7 @@
<input type="hidden" value="{$site_code}" name="Detail2.{normalize-space($dbID)}.site_code" id="site_code" />
<input type="hidden" value="{$sort_order}" name="Detail2.{normalize-space($dbID)}.sort_order" id="sort_order" />
<input type="hidden" value="{$wave_on}" name="Detail2.{normalize-space($dbID)}.wave_on" id="wave_on" />
<input type="hidden" value="{$item_ser__from}" name="Detail2.{normalize-space($dbID)}.item_ser__from" id="item_ser__from" />
<input type="hidden" value="{$item_ser__to}" name="Detail2.{normalize-space($dbID)}.item_ser__to" id="item_ser__to" />
<input type="hidden" value="{$product_style__from}" name="Detail2.{normalize-space($dbID)}.product_style__from" id="product_style__from" />
......@@ -222,6 +226,8 @@
<input type="hidden" value="{$due_date__to}" name="Detail2.{normalize-space($dbID)}.due_date__to" id="due_date__to" />
<input type="hidden" value="{$sale_order__from}" name="Detail2.{normalize-space($dbID)}.sale_order__from" id="sale_order__from" />
<input type="hidden" value="{$sale_order__to}" name="Detail2.{normalize-space($dbID)}.sale_order__to" id="sale_order__to" />
<input type="hidden" value="{$dist_order__from}" name="Detail2.{normalize-space($dbID)}.dist_order__from" id="dist_order__from" />
<input type="hidden" value="{$dist_order__to}" name="Detail2.{normalize-space($dbID)}.dist_order__to" id="dist_order__to" />
<input type="hidden" value="{$cust_code__dlv__from}" name="Detail2.{normalize-space($dbID)}.cust_code__dlv__from" id="cust_code__dlv__from" />
<input type="hidden" value="{$cust_code__dlv__to}" name="Detail2.{normalize-space($dbID)}.cust_code__dlv__to" id="cust_code__dlv__to" />
<input type="hidden" value="{$credit_term__from}" name="Detail2.{normalize-space($dbID)}.credit_term__from" id="credit_term__from" />
......@@ -401,7 +407,7 @@
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.due_date" value="{$due_date}"></input>
</td>
<td nowrap="true" style="padding:0 3px;">
<div style="height:31px;line-height:31px;">
<div style="height:31px;line-height:31px;width:115px;">
<xsl:value-of select="item_code"/>
<img type="image" src="{$image_path}" class="itemImg" onclick="showItemImage('{normalize-space($item_code)}','{$item_descr}');" />
<input type="hidden" name="Detail2.{normalize-space($linedbID)}.item_code" value="{$item_code}"></input>
......
webitm-wms/module-resource/web/xsl/WIZARD/wavegen_wiz_SummaryPage_wiz_en_US_A.xsl
View file @ 70f5c94e
......@@ -104,7 +104,14 @@
<th>Reference ID</th>
<th>Status</th>
<th>PTCN</th>
<th>Sales Order</th>
<th>
<xsl:if test="//summaryData/@waveOn='S-ORD'">
Sales Order
</xsl:if>
<xsl:if test="//summaryData/@waveOn='D-ORD'">
Distribution Order
</xsl:if>
</th>
<th>Task Status</th>
</tr>
</thead>
......
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