Skip to content

B
business-java
Commit 919b0442 authored by vhegde's avatar vhegde
Browse files
Options

changed by sankara on 28/05/14 updated WavegGnerationPrc and ReplIssIC and... 

changed by sankara on 28/05/14 updated WavegGnerationPrc and ReplIssIC and wave_task srd and metadata and messages sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95139 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 25dbff0d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 746 additions and 419 deletions
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 919b0442
...@@ -1542,6 +1542,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -1542,6 +1542,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
} }
}//else of if ( "D".equalsIgnoreCase(orderType) ) }//else of if ( "D".equalsIgnoreCase(orderType) )
} }
//changed by sankara on 08/05/14 for loc code to and suggestion loc code check start.
locCodeSys = checkNull(genericUtility.getColumnValue("loc_code__sys", allFormDataDom, "3" ));
System.out.println("locCodeSys:::::::"+locCodeSys);
System.out.println("locCodeTo::::::::"+locCodeTo);
if( !locCodeSys.trim().equalsIgnoreCase(locCodeTo.trim()))
{
errList.add( "VTSYSLOCCD" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by sankara on 08/05/14 for loc code to and suggestion loc code check end.
//Changed by sumit on 09/10/12 write this code in post save start. //Changed by sumit on 09/10/12 write this code in post save start.
/*if("D".equals(orderType) || "L".equals(orderType)) /*if("D".equals(orderType) || "L".equals(orderType))
{ {
...@@ -3171,6 +3182,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC ...@@ -3171,6 +3182,17 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
} }
} }
//changed by sankara on 08/05/14 for check loc code to and suggestion loc code start.
locCodeTo = checkNull(genericUtility.getColumnValue("loc_code__to", allFormDataDom, "4" ));
locCodeSys = checkNull(genericUtility.getColumnValue("loc_code__sys", allFormDataDom, "4" ));
System.out.println("dom4locCodeTo::::::"+locCodeTo);
System.out.println("dom4locCodeSys::::::"+locCodeSys);
if( !locCodeSys.trim().equalsIgnoreCase(locCodeTo.trim()))
{
errList.add( "VTSYSLOCCD" );
errFields.add( childNodeName.toLowerCase() );
}
//changed by sankara on 08/05/14 check loc code to and suggestion loc code end.
} }
} }
} }
......
webitm-wms/module-resource/metadata/wave_task11.xml
View file @ 919b0442
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
<grid.lines>0</grid.lines> <grid.lines>0</grid.lines>
</BaseDefinition> </BaseDefinition>
<Header> <Header>
<height>22</height> <height>20</height>
<color>536870912</color> <color>536870912</color>
</Header> </Header>
<Summary> <Summary>
<height>7</height> <height>0</height>
<color>536870912</color> <color>536870912</color>
</Summary> </Summary>
<Footer> <Footer>
...@@ -147,13 +147,21 @@ ...@@ -147,13 +147,21 @@
<name>status</name> <name>status</name>
<dbname>status</dbname> <dbname>status</dbname>
</table_column> </table_column>
<table_column>
<type size="70">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>remarks</name>
<dbname>wave_task.remarks</dbname>
</table_column>
<table_column> <table_column>
<type size="5">char</type> <type size="5">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<name>site_code</name> <name>site_code</name>
<dbname>wave_task.site_code</dbname> <dbname>wave_task.site_code</dbname>
</table_column> </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 WAVE_TASK.CANCEL = &apos;Y&apos; then &apos;CANCELED&apos; WHEN FN_WAVE_STATUS(WAVE_ID) = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;) COLUMN(NAME=&quot;wave_task.site_code&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;CANCELED&apos; WHEN FN_WAVE_STATUS(WAVE_ID) = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;) COLUMN(NAME=&quot;wave_task.remarks&quot;) COLUMN(NAME=&quot;wave_task.site_code&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> <update>WAVE_TASK</update>
<updatewhere>1</updatewhere> <updatewhere>1</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
...@@ -392,12 +400,12 @@ ...@@ -392,12 +400,12 @@
</TextObject> </TextObject>
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>2</alignment> <alignment>0</alignment>
<text>Hold Status</text> <text>Hold Status</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>704</x> <x>704</x>
<y>3</y> <y>2</y>
<height>16</height> <height>16</height>
<width>76</width> <width>76</width>
<html> <html>
...@@ -427,7 +435,7 @@ ...@@ -427,7 +435,7 @@
<x>782</x> <x>782</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>79</width> <width>85</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -452,10 +460,10 @@ ...@@ -452,10 +460,10 @@
<text>Status</text> <text>Status</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>863</x> <x>869</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>82</width> <width>90</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -480,10 +488,10 @@ ...@@ -480,10 +488,10 @@
<text>Changed User</text> <text>Changed User</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1030</x> <x>1457</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>59</width> <width>86</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -508,10 +516,10 @@ ...@@ -508,10 +516,10 @@
<text>Changed Term</text> <text>Changed Term</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1091</x> <x>1545</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>62</width> <width>88</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -536,7 +544,7 @@ ...@@ -536,7 +544,7 @@
<text>Change Date</text> <text>Change Date</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>1155</x> <x>1635</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>80</width> <width>80</width>
...@@ -558,26 +566,54 @@ ...@@ -558,26 +566,54 @@
<color>67108864</color> <color>67108864</color>
</background> </background>
</TextObject> </TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Remarks</text>
<border>6</border>
<color>0</color>
<x>1050</x>
<y>2</y>
<height>16</height>
<width>405</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>remarks_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
</background>
</TextObject>
<TextObject> <TextObject>
<band>Header</band> <band>Header</band>
<alignment>0</alignment> <alignment>0</alignment>
<text>Site Code</text> <text>Site Code</text>
<border>6</border> <border>6</border>
<color>0</color> <color>0</color>
<x>947</x> <x>961</x>
<y>1</y> <y>2</y>
<height>17</height> <height>16</height>
<width>81</width> <width>87</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>site_code_t</name> <name>site_code_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Arial</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
<weight>400</weight> <weight>400</weight>
<family>2</family> <family>1</family>
<pitch>2</pitch> <pitch>2</pitch>
<charset>0</charset> <charset>0</charset>
</font> </font>
...@@ -944,7 +980,7 @@ ...@@ -944,7 +980,7 @@
<x>782</x> <x>782</x>
<y>0</y> <y>0</y>
<height>19</height> <height>19</height>
<width>79</width> <width>85</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -977,10 +1013,10 @@ ...@@ -977,10 +1013,10 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>863</x> <x>869</x>
<y>0</y> <y>0</y>
<height>19</height> <height>19</height>
<width>82</width> <width>90</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -1014,10 +1050,10 @@ ...@@ -1014,10 +1050,10 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1030</x> <x>1457</x>
<y>0</y> <y>0</y>
<height>19</height> <height>19</height>
<width>59</width> <width>86</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -1053,10 +1089,10 @@ ...@@ -1053,10 +1089,10 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1091</x> <x>1545</x>
<y>0</y> <y>0</y>
<height>19</height> <height>19</height>
<width>62</width> <width>88</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
...@@ -1092,7 +1128,7 @@ ...@@ -1092,7 +1128,7 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>1155</x> <x>1635</x>
<y>0</y> <y>0</y>
<height>19</height> <height>19</height>
<width>80</width> <width>80</width>
...@@ -1131,10 +1167,46 @@ ...@@ -1131,10 +1167,46 @@
<tabsequence>32766</tabsequence> <tabsequence>32766</tabsequence>
<border>5</border> <border>5</border>
<color>33554432</color> <color>33554432</color>
<x>947</x> <x>1050</x>
<y>2</y>
<height>17</height>
<width>405</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>remarks</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>16</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>961</x>
<y>2</y> <y>2</y>
<height>16</height> <height>16</height>
<width>81</width> <width>87</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
......
webitm-wms/module-resource/sql/update.sql
View file @ 919b0442
...@@ -45302,3 +45302,35 @@ VALUES ( ...@@ -45302,3 +45302,35 @@ VALUES (
NULL, NULL,
NULL); NULL);
commit; commit;
-- changed by sankara on 28/05/14 updated alter and messages sql
alter table wave_task add remarks char(70);
INSERT INTO messages (
msg_no,
msg_str ,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option)
VALUES (
'VTSYSLOCCD',
'Location Code mismatch',
'Location Code To and Suggested Location are not same',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
commit;
\ No newline at end of file
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