Updated by sumit on 04/02/13 showing status cancel if wave canceled

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92631 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/module-resource/metadata/wave_task11.xml

@@ -44,7 +44,7 @@
 		<color>536870912</color>
 	</Footer>
 	<Detail>
-		<height>23</height>
+		<height>22</height>
 		<color>536870912</color>
 	</Detail>
 	<TableDefinition>
@@ -147,7 +147,7 @@
 			<name>status</name>
 			<dbname>status</dbname>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COLUMN(NAME=&quot;wave_task.cancel&quot;) COMPUTE(NAME=&quot;CASE WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;)WHERE(    EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot;   OP =&quot;&gt;=&quot;    EXP2 =&quot;:from_date&quot;    LOGIC =&quot;and&quot; ) WHERE(    EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot;   OP =&quot;&lt;=&quot;    EXP2 =&quot;:to_date&quot; ) ) ARG(NAME = &quot;from_date&quot; TYPE = datetime)  ARG(NAME = &quot;to_date&quot; TYPE = datetime) </retrieve>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COLUMN(NAME=&quot;wave_task.cancel&quot;) COMPUTE(NAME=&quot;CASE WHEN WAVE_TASK.CANCEL = &apos;Y&apos; then &apos;CANCEL&apos; WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;)WHERE(    EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot;   OP =&quot;&gt;=&quot;    EXP2 =&quot;:from_date&quot;    LOGIC =&quot;and&quot; ) WHERE(    EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot;   OP =&quot;&lt;=&quot;    EXP2 =&quot;:to_date&quot; ) ) ARG(NAME = &quot;from_date&quot; TYPE = datetime)  ARG(NAME = &quot;to_date&quot; TYPE = datetime) </retrieve>
 		<update>WAVE_TASK</update>
 		<updatewhere>1</updatewhere>
 		<updatekeyinplace>no</updatekeyinplace>

webitm-wms/module-resource/metadata/wave_task21.xml

@@ -155,7 +155,7 @@
 			<name>status</name>
 			<dbname>status</dbname>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; )  TABLE(NAME=&quot;customer&quot; ALIAS=&quot;customer_a&quot; )  TABLE(NAME=&quot;customer&quot; ALIAS=&quot;customer_b&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;customer_a.cust_name&quot;) COLUMN(NAME=&quot;customer_b.cust_name&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COMPUTE(NAME=&quot;CASE WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;)    JOIN (LEFT=&quot;wave_task.cust_code__from&quot;    OP =&quot;=&quot;RIGHT=&quot;customer_a.cust_code&quot;    OUTER1 =&quot;wave_task.cust_code__from&quot; )    JOIN (LEFT=&quot;wave_task.cust_code__to&quot;    OP =&quot;=&quot;RIGHT=&quot;customer_b.cust_code&quot;    OUTER1 =&quot;wave_task.cust_code__to&quot; )WHERE(    EXP1 =&quot;wave_task.wave_id&quot;   OP =&quot;=&quot;    EXP2 =&quot;:id&quot; ) ) ARG(NAME = &quot;id&quot; TYPE = string) </retrieve>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; )  TABLE(NAME=&quot;customer&quot; ALIAS=&quot;customer_a&quot; )  TABLE(NAME=&quot;customer&quot; ALIAS=&quot;customer_b&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;customer_a.cust_name&quot;) COLUMN(NAME=&quot;customer_b.cust_name&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COMPUTE(NAME=&quot;CASE WHEN WAVE_TASK.CANCEL = &apos;Y&apos; then &apos;CANCEL&apos; WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;)    JOIN (LEFT=&quot;wave_task.cust_code__from&quot;    OP =&quot;=&quot;RIGHT=&quot;customer_a.cust_code&quot;    OUTER1 =&quot;wave_task.cust_code__from&quot; )    JOIN (LEFT=&quot;wave_task.cust_code__to&quot;    OP =&quot;=&quot;RIGHT=&quot;customer_b.cust_code&quot;    OUTER1 =&quot;wave_task.cust_code__to&quot; )WHERE(    EXP1 =&quot;wave_task.wave_id&quot;   OP =&quot;=&quot;    EXP2 =&quot;:id&quot; ) ) ARG(NAME = &quot;id&quot; TYPE = string) </retrieve>
 		<update>WAVE_TASK</update>
 		<updatewhere>0</updatewhere>
 		<updatekeyinplace>no</updatekeyinplace>

webitm-wms/module-resource/srd/d_wave_task11.srd

@@ -4,7 +4,7 @@ datawindow(units=1 timer_interval=0 color=67108864 processing=1 HTMLDW=no print.
 header(height=22 color="536870912" )
 summary(height=0 color="536870912" )
 footer(height=0 color="536870912" )
-detail(height=23 color="536870912" )
+detail(height=22 color="536870912" )
 table(column=(type=char(12) update=yes updatewhereclause=yes key=yes name=wave_id dbname="wave_task.wave_id" )
  column=(type=datetime update=yes updatewhereclause=yes name=tran_date dbname="wave_task.tran_date" )
  column=(type=char(10) update=yes updatewhereclause=yes name=sale_order__from dbname="wave_task.sale_order__from" )
@@ -19,7 +19,7 @@ table(column=(type=char(12) update=yes updatewhereclause=yes key=yes name=wave_i
  column=(type=char(1) update=yes updatewhereclause=yes name=hold_status dbname="wave_task.hold_status" initial="N" )
  column=(type=char(1) update=yes updatewhereclause=yes name=cancel dbname="wave_task.cancel" )
  column=(type=char(9) updatewhereclause=yes name=status dbname="status" )
- retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"wave_task~" ) COLUMN(NAME=~"wave_task.wave_id~") COLUMN(NAME=~"wave_task.tran_date~") COLUMN(NAME=~"wave_task.sale_order__from~") COLUMN(NAME=~"wave_task.sale_order__to~") COLUMN(NAME=~"wave_task.cust_code__from~") COLUMN(NAME=~"wave_task.cust_code__to~") COLUMN(NAME=~"wave_task.due_date__from~") COLUMN(NAME=~"wave_task.due_date__to~") COLUMN(NAME=~"wave_task.chg_user~") COLUMN(NAME=~"wave_task.chg_term~") COLUMN(NAME=~"wave_task.chg_date~") COLUMN(NAME=~"wave_task.hold_status~") COLUMN(NAME=~"wave_task.cancel~") COMPUTE(NAME=~"CASE WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = 'Y' THEN 'COMPLETED' ELSE 'PENDING' END STATUS~")WHERE(    EXP1 =~"~~~"WAVE_TASK~~~".~~~"TRAN_DATE~~~"~"   OP =~">=~"    EXP2 =~":from_date~"    LOGIC =~"and~" ) WHERE(    EXP1 =~"~~~"WAVE_TASK~~~".~~~"TRAN_DATE~~~"~"   OP =~"<=~"    EXP2 =~":to_date~" ) ) ARG(NAME = ~"from_date~" TYPE = datetime)  ARG(NAME = ~"to_date~" TYPE = datetime) " update="WAVE_TASK" updatewhere=1 updatekeyinplace=no arguments=(("from_date", datetime),("to_date", datetime)) )
+ retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"wave_task~" ) COLUMN(NAME=~"wave_task.wave_id~") COLUMN(NAME=~"wave_task.tran_date~") COLUMN(NAME=~"wave_task.sale_order__from~") COLUMN(NAME=~"wave_task.sale_order__to~") COLUMN(NAME=~"wave_task.cust_code__from~") COLUMN(NAME=~"wave_task.cust_code__to~") COLUMN(NAME=~"wave_task.due_date__from~") COLUMN(NAME=~"wave_task.due_date__to~") COLUMN(NAME=~"wave_task.chg_user~") COLUMN(NAME=~"wave_task.chg_term~") COLUMN(NAME=~"wave_task.chg_date~") COLUMN(NAME=~"wave_task.hold_status~") COLUMN(NAME=~"wave_task.cancel~") COMPUTE(NAME=~"CASE WHEN WAVE_TASK.CANCEL = 'Y' then 'CANCEL' WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = 'Y' THEN 'COMPLETED' ELSE 'PENDING' END STATUS~")WHERE(    EXP1 =~"~~~"WAVE_TASK~~~".~~~"TRAN_DATE~~~"~"   OP =~">=~"    EXP2 =~":from_date~"    LOGIC =~"and~" ) WHERE(    EXP1 =~"~~~"WAVE_TASK~~~".~~~"TRAN_DATE~~~"~"   OP =~"<=~"    EXP2 =~":to_date~" ) ) ARG(NAME = ~"from_date~" TYPE = datetime)  ARG(NAME = ~"to_date~" TYPE = datetime) " update="WAVE_TASK" updatewhere=1 updatekeyinplace=no arguments=(("from_date", datetime),("to_date", datetime)) )
 text(band=header alignment="2" text="Wave ID" border="6" color="0" x="2" y="2" height="16" width="75" html.valueishtml="0"  name=wave_id_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="2" text="Transaction Date" border="6" color="0" x="79" y="2" height="16" width="101" html.valueishtml="0"  name=tran_date_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="2" text="Sale Order from" border="6" color="0" x="182" y="2" height="16" width="89" html.valueishtml="0"  name=sale_order__from_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )

webitm-wms/module-resource/srd/d_wave_task21.srd

@@ -20,7 +20,7 @@ table(column=(type=char(12) update=yes updatewhereclause=yes key=yes name=wave_i
  column=(type=char(40) updatewhereclause=yes name=cust_name__to dbname="customer.cust_name" )
  column=(type=char(1) update=yes updatewhereclause=yes name=hold_status dbname="wave_task.hold_status" initial="N" values="Y	Y/N	N/" )
  column=(type=char(9) updatewhereclause=yes name=status dbname="status" )
- retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"wave_task~" )  TABLE(NAME=~"customer~" ALIAS=~"customer_a~" )  TABLE(NAME=~"customer~" ALIAS=~"customer_b~" ) COLUMN(NAME=~"wave_task.wave_id~") COLUMN(NAME=~"wave_task.tran_date~") COLUMN(NAME=~"wave_task.sale_order__from~") COLUMN(NAME=~"wave_task.sale_order__to~") COLUMN(NAME=~"wave_task.cust_code__from~") COLUMN(NAME=~"wave_task.cust_code__to~") COLUMN(NAME=~"wave_task.due_date__from~") COLUMN(NAME=~"wave_task.due_date__to~") COLUMN(NAME=~"wave_task.chg_user~") COLUMN(NAME=~"wave_task.chg_term~") COLUMN(NAME=~"wave_task.chg_date~") COLUMN(NAME=~"customer_a.cust_name~") COLUMN(NAME=~"customer_b.cust_name~") COLUMN(NAME=~"wave_task.hold_status~") COMPUTE(NAME=~"CASE WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = 'Y' THEN 'COMPLETED' ELSE 'PENDING' END STATUS~")    JOIN (LEFT=~"wave_task.cust_code__from~"    OP =~"=~"RIGHT=~"customer_a.cust_code~"    OUTER1 =~"wave_task.cust_code__from~" )    JOIN (LEFT=~"wave_task.cust_code__to~"    OP =~"=~"RIGHT=~"customer_b.cust_code~"    OUTER1 =~"wave_task.cust_code__to~" )WHERE(    EXP1 =~"wave_task.wave_id~"   OP =~"=~"    EXP2 =~":id~" ) ) ARG(NAME = ~"id~" TYPE = string) " update="WAVE_TASK" updatewhere=0 updatekeyinplace=no arguments=(("id", string)) )
+ retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"wave_task~" )  TABLE(NAME=~"customer~" ALIAS=~"customer_a~" )  TABLE(NAME=~"customer~" ALIAS=~"customer_b~" ) COLUMN(NAME=~"wave_task.wave_id~") COLUMN(NAME=~"wave_task.tran_date~") COLUMN(NAME=~"wave_task.sale_order__from~") COLUMN(NAME=~"wave_task.sale_order__to~") COLUMN(NAME=~"wave_task.cust_code__from~") COLUMN(NAME=~"wave_task.cust_code__to~") COLUMN(NAME=~"wave_task.due_date__from~") COLUMN(NAME=~"wave_task.due_date__to~") COLUMN(NAME=~"wave_task.chg_user~") COLUMN(NAME=~"wave_task.chg_term~") COLUMN(NAME=~"wave_task.chg_date~") COLUMN(NAME=~"customer_a.cust_name~") COLUMN(NAME=~"customer_b.cust_name~") COLUMN(NAME=~"wave_task.hold_status~") COMPUTE(NAME=~"CASE WHEN WAVE_TASK.CANCEL = 'Y' then 'CANCEL' WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM  DUAL)    = 'Y' THEN 'COMPLETED' ELSE 'PENDING' END STATUS~")    JOIN (LEFT=~"wave_task.cust_code__from~"    OP =~"=~"RIGHT=~"customer_a.cust_code~"    OUTER1 =~"wave_task.cust_code__from~" )    JOIN (LEFT=~"wave_task.cust_code__to~"    OP =~"=~"RIGHT=~"customer_b.cust_code~"    OUTER1 =~"wave_task.cust_code__to~" )WHERE(    EXP1 =~"wave_task.wave_id~"   OP =~"=~"    EXP2 =~":id~" ) ) ARG(NAME = ~"id~" TYPE = string) " update="WAVE_TASK" updatewhere=0 updatekeyinplace=no arguments=(("id", string)) )
 text(band=detail alignment="1" text="Wave ID:" border="0" color="0" x="27" y="14" height="16" width="102" html.valueishtml="0"  name=wave_id_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="255" x="133" y="14" height="16" width="82" format="[general]" html.valueishtml="0"  name=wave_id  tag="Ttransaction ID of wave task" visible="1" edit.limit=12 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 text(band=detail alignment="1" text="Sale order from:" border="0" color="0" x="27" y="41" height="16" width="102" html.valueishtml="0"  name=sale_order__from_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )