Commit 30011095 authored by ppatro's avatar ppatro

To merge src for WMS updated wave gen changes.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91975 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5b31f7aa
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>module-resource</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
......@@ -31,7 +31,7 @@
</print>
</BaseDefinition>
<Summary>
<height>3</height>
<height>4</height>
<color>536870912</color>
</Summary>
<Footer>
......@@ -39,7 +39,7 @@
<color>536870912</color>
</Footer>
<Detail>
<height>312</height>
<height>247</height>
<color>536870912</color>
</Detail>
<TableDefinition>
......@@ -132,7 +132,14 @@
<name>order_type</name>
<dbname>order_type</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;repl_iss_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;repl_iss_hdr.tran_id&quot;) COLUMN(NAME=&quot;repl_iss_hdr.tran_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.site_code&quot;) COLUMN(NAME=&quot;repl_iss_hdr.repl_order&quot;) COLUMN(NAME=&quot;repl_iss_hdr.confirmed&quot;) COLUMN(NAME=&quot;repl_iss_hdr.conf_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_user&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) COMPUTE(NAME=&quot;&apos; &apos; order_type&quot;) JOIN (LEFT=&quot;repl_iss_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; ) JOIN (LEFT=&quot;repl_iss_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; )) </retrieve>
<table_column>
<type size="15">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>carton_no</name>
<dbname>repl_iss_hdr.carton_no</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;repl_iss_hdr&quot; ) TABLE(NAME=&quot;site&quot; ) TABLE(NAME=&quot;employee&quot; ) COLUMN(NAME=&quot;repl_iss_hdr.tran_id&quot;) COLUMN(NAME=&quot;repl_iss_hdr.tran_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.site_code&quot;) COLUMN(NAME=&quot;repl_iss_hdr.repl_order&quot;) COLUMN(NAME=&quot;repl_iss_hdr.confirmed&quot;) COLUMN(NAME=&quot;repl_iss_hdr.conf_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.emp_code__aprv&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_user&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_date&quot;) COLUMN(NAME=&quot;repl_iss_hdr.chg_term&quot;) COLUMN(NAME=&quot;site.descr&quot;) COMPUTE(NAME=&quot;(employee.emp_fname|| &apos; &apos; ||employee.emp_mname||&apos; &apos;||employee.emp_lname) emp_name&quot;) COMPUTE(NAME=&quot;&apos; &apos; order_type&quot;) COLUMN(NAME=&quot;repl_iss_hdr.carton_no&quot;) JOIN (LEFT=&quot;repl_iss_hdr.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; ) JOIN (LEFT=&quot;repl_iss_hdr.emp_code__aprv&quot; OP =&quot;=&quot;RIGHT=&quot;employee.emp_code&quot; )) </retrieve>
<update>REPL_ISS_HDR</update>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
......@@ -408,34 +415,6 @@
<color>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Change User:</text>
<border>0</border>
<color>33554432</color>
<x>31</x>
<y>155</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_user_t</name>
<visible>0</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>536870912</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>8</id>
......@@ -540,72 +519,6 @@
<color>67108864</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>133</x>
<y>179</y>
<height>16</height>
<width>66</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<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>67108864</color>
</background>
</ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Change Term:</text>
<border>0</border>
<color>33554432</color>
<x>31</x>
<y>179</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term_t</name>
<visible>0</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>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
......@@ -934,6 +847,164 @@
<color>67108864</color>
</background>
</ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Change User:</text>
<border>0</border>
<color>33554432</color>
<x>31</x>
<y>155</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_user_t</name>
<visible>0</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>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Change Term:</text>
<border>0</border>
<color>33554432</color>
<x>31</x>
<y>179</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term_t</name>
<visible>0</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>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Carton No</text>
<border>0</border>
<color>33554432</color>
<x>28</x>
<y>203</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>carton_no_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>
<ColumnObject>
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>133</x>
<y>179</y>
<height>16</height>
<width>66</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>chg_term</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>15</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<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>67108864</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>255</color>
<x>133</x>
<y>202</y>
<height>16</height>
<width>66</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>carton_no</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>67108864</color>
</background>
</ColumnObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......
......@@ -32795,12 +32795,164 @@ VALUES (
'S',
NULL,
NULL);
update obj_forms set scan_metadata='<SCAN_INFO><MAPPING_SCAN ORDER="1"><SCAN_LABEL>Location From:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>loc_code</FIELD></FIELDS></MAPPING_SCAN><MAPPING_SCAN ORDER="2"><SCAN_LABEL>LPN No:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl</FIELD></FIELDS></MAPPING_SCAN><INPUT_SCAN ORDER="1"><SCAN_LABEL>New LPN:</SCAN_LABEL><FIELDS SEPARATOR="" DELIMITER=""><FIELD>lot_sl__new</FIELD></FIELDS></INPUT_SCAN> <SCAN_CONDITION field="lot_sl__new">order_type != ''T''</SCAN_CONDITION></SCAN_INFO>'
where win_name='w_active_repl_iss' and form_no='3';
update messages set msg_str = 'No record to process', msg_descr = 'No record to process for the selected parameters'
where msg_no = 'VTNOREC2';
update transetup set header_form_no='2' where tran_window='w_active_pick';
INSERT INTO refser (
ref_ser,
descr,
type,
sys_ser,
prefix,
chg_date,
chg_user,
chg_term,
seq_name,
tax_form_reqd,
trans_type)
VALUES (
'R-CPA ',
'Replenishment Task (Case to Active)',
'S',
'R-CPA ',
NULL,
fn_sysdate(),
'Rohan ',
'Base ',
NULL,
NULL,
NULL);
INSERT INTO refser (
ref_ser,
descr,
type,
sys_ser,
prefix,
chg_date,
chg_user,
chg_term,
seq_name,
tax_form_reqd,
trans_type)
VALUES (
'RP-ACT',
'Repanishment Task(Partial-Active)',
'S',
'RP-ACT',
NULL,
fn_sysdate(),
'Rohan ',
'Base ',
NULL,
NULL,
NULL);
INSERT INTO refser (
ref_ser,
descr,
type,
sys_ser,
prefix,
chg_date,
chg_user,
chg_term,
seq_name,
tax_form_reqd,
trans_type)
VALUES (
'RR-DSA',
'Repanishment Task(PSO-Active)',
'S',
'RR-DSA',
NULL,
fn_sysdate(),
'Rohan ',
'Base ',
NULL,
NULL,
NULL);
INSERT INTO refser (
ref_ser,
descr,
type,
sys_ser,
prefix,
chg_date,
chg_user,
chg_term,
seq_name,
tax_form_reqd,
trans_type)
VALUES (
'RD-DSA',
'Repanishment Task(DSO-Active)',
'S',
'RD-DSA',
NULL,
fn_sysdate(),
'Rohan ',
'Base ',
NULL,
NULL,
NULL);
INSERT INTO refser (
ref_ser,
descr,
type,
sys_ser,
prefix,
chg_date,
chg_user,
chg_term,
seq_name,
tax_form_reqd,
trans_type)
VALUES (
'RN-DSA',
'Replenishment Task ( PND-Active)',
'S',
'RN-DSA',
NULL,
fn_sysdate(),
'Rohan ',
'Base ',
NULL,
NULL,
NULL);
INSERT INTO wave_seq (
ref_ser,
priority)
VALUES (
'R-CPA',
4);
INSERT INTO wave_seq (
ref_ser,
priority)
VALUES (
'RD-DSA',
4);
INSERT INTO wave_seq (
ref_ser,
priority)
VALUES (
'RR-DSA',
4);
INSERT INTO wave_seq (
ref_ser,
priority)
VALUES (
'RP-ACT',
4);
INSERT INTO wave_seq (
ref_ser,
priority)
VALUES (
'RN-DSA',
4);
COMMIT;
......
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