Commit 2f9b04ae authored by msharma's avatar msharma

Make outer join with inv_lock


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94052 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4396ab5b
......@@ -70,13 +70,6 @@
<name>site_code</name>
<dbname>inv_hold.site_code</dbname>
</table_column>
<table_column>
<type size="60">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>remarks</name>
<dbname>inv_hold.remarks</dbname>
</table_column>
<table_column>
<type size="1">char</type>
<update>yes</update>
......@@ -98,6 +91,13 @@
<name>emp_code__aprv</name>
<dbname>inv_hold.emp_code__aprv</dbname>
</table_column>
<table_column>
<type size="60">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>remarks</name>
<dbname>inv_hold.remarks</dbname>
</table_column>
<table_column>
<type size="10">char</type>
<update>yes</update>
......@@ -146,30 +146,9 @@
<name>lock_descr</name>
<dbname>inv_lock.descr</dbname>
</table_column>
<table_column>
<type size="10">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>ref_id</name>
<dbname>inv_hold.ref_id</dbname>
</table_column>
<table_column>
<type size="6">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>ref_ser</name>
<dbname>inv_hold.ref_ser</dbname>
</table_column>
<table_column>
<type size="30">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>ref_no</name>
<dbname>inv_hold.ref_no</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;inv_hold&quot; ) TABLE(NAME=&quot;inv_lock&quot; ) COLUMN(NAME=&quot;inv_hold.tran_id&quot;) COLUMN(NAME=&quot;inv_hold.tran_date&quot;) COLUMN(NAME=&quot;inv_hold.site_code&quot;) COLUMN(NAME=&quot;inv_hold.remarks&quot;) COLUMN(NAME=&quot;inv_hold.confirmed&quot;) COLUMN(NAME=&quot;inv_hold.conf_date&quot;) COLUMN(NAME=&quot;inv_hold.emp_code__aprv&quot;) COLUMN(NAME=&quot;inv_hold.chg_user&quot;) COLUMN(NAME=&quot;inv_hold.chg_date&quot;) COLUMN(NAME=&quot;inv_hold.chg_term&quot;) COLUMN(NAME=&quot;inv_hold.dept_code&quot;) COLUMN(NAME=&quot;inv_hold.role_code&quot;) COLUMN(NAME=&quot;inv_hold.lock_code&quot;) COLUMN(NAME=&quot;inv_lock.descr&quot;) COLUMN(NAME=&quot;inv_hold.ref_id&quot;) COLUMN(NAME=&quot;inv_hold.ref_ser&quot;) COLUMN(NAME=&quot;inv_hold.ref_no&quot;) JOIN (LEFT=&quot;inv_hold.lock_code&quot; OP =&quot;=&quot;RIGHT=&quot;inv_lock.lock_code&quot; )WHERE( EXP1 =&quot;inv_hold.tran_date&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:period_from&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;inv_hold.tran_date&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:period_to&quot; ) ) ARG(NAME = &quot;period_from&quot; TYPE = datetime) ARG(NAME = &quot;period_to&quot; TYPE = datetime) </retrieve>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;inv_hold&quot; ) TABLE(NAME=&quot;inv_lock&quot; ) COLUMN(NAME=&quot;inv_hold.tran_id&quot;) COLUMN(NAME=&quot;inv_hold.tran_date&quot;) COLUMN(NAME=&quot;inv_hold.site_code&quot;) COLUMN(NAME=&quot;inv_hold.confirmed&quot;) COLUMN(NAME=&quot;inv_hold.conf_date&quot;) COLUMN(NAME=&quot;inv_hold.emp_code__aprv&quot;) COLUMN(NAME=&quot;inv_hold.remarks&quot;) COLUMN(NAME=&quot;inv_hold.chg_user&quot;) COLUMN(NAME=&quot;inv_hold.chg_date&quot;) COLUMN(NAME=&quot;inv_hold.chg_term&quot;) COLUMN(NAME=&quot;inv_hold.dept_code&quot;) COLUMN(NAME=&quot;inv_hold.role_code&quot;) COLUMN(NAME=&quot;inv_hold.lock_code&quot;) COLUMN(NAME=&quot;inv_lock.descr&quot;) JOIN (LEFT=&quot;inv_lock.lock_code&quot; OP =&quot;=&quot;RIGHT=&quot;inv_hold.lock_code&quot; OUTER2 =&quot;inv_hold.lock_code&quot; )WHERE( EXP1 =&quot;inv_hold.tran_date&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:period_from&quot; LOGIC =&quot;And&quot; ) WHERE( EXP1 =&quot;inv_hold.tran_date&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:period_to&quot; ) ) ARG(NAME = &quot;period_from&quot; TYPE = datetime) ARG(NAME = &quot;period_to&quot; TYPE = datetime) </retrieve>
<update>inv_hold</update>
<updatewhere>1</updatewhere>
<updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
<argument>
<name>period_from</name>
......@@ -270,7 +249,7 @@
<text>Lock Code</text>
<border>6</border>
<color>33554432</color>
<x>975</x>
<x>195</x>
<y>2</y>
<height>16</height>
<width>59</width>
......@@ -298,10 +277,10 @@
<text>Lock Description</text>
<border>6</border>
<color>33554432</color>
<x>1036</x>
<x>256</x>
<y>2</y>
<height>16</height>
<width>140</width>
<width>196</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -326,7 +305,7 @@
<text>Confirmed</text>
<border>6</border>
<color>33554432</color>
<x>314</x>
<x>454</x>
<y>2</y>
<height>16</height>
<width>58</width>
......@@ -354,7 +333,7 @@
<text>Confirm Date</text>
<border>6</border>
<color>33554432</color>
<x>374</x>
<x>514</x>
<y>2</y>
<height>16</height>
<width>80</width>
......@@ -382,7 +361,7 @@
<text>Approved By</text>
<border>6</border>
<color>33554432</color>
<x>456</x>
<x>596</x>
<y>2</y>
<height>16</height>
<width>94</width>
......@@ -410,10 +389,10 @@
<text>Remarks</text>
<border>6</border>
<color>33554432</color>
<x>195</x>
<x>692</x>
<y>2</y>
<height>16</height>
<width>117</width>
<width>366</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -438,7 +417,7 @@
<text>Chg User</text>
<border>6</border>
<color>33554432</color>
<x>552</x>
<x>1060</x>
<y>2</y>
<height>16</height>
<width>66</width>
......@@ -466,7 +445,7 @@
<text>Chg Date</text>
<border>6</border>
<color>33554432</color>
<x>620</x>
<x>1128</x>
<y>2</y>
<height>16</height>
<width>69</width>
......@@ -494,7 +473,7 @@
<text>Chg Term</text>
<border>6</border>
<color>33554432</color>
<x>691</x>
<x>1199</x>
<y>2</y>
<height>16</height>
<width>96</width>
......@@ -522,7 +501,7 @@
<text>Dept Code</text>
<border>6</border>
<color>33554432</color>
<x>789</x>
<x>1297</x>
<y>2</y>
<height>16</height>
<width>91</width>
......@@ -550,7 +529,7 @@
<text>Role Code</text>
<border>6</border>
<color>33554432</color>
<x>882</x>
<x>1390</x>
<y>2</y>
<height>16</height>
<width>91</width>
......@@ -572,90 +551,6 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Ref Id</text>
<border>6</border>
<color>33554432</color>
<x>1178</x>
<y>2</y>
<height>16</height>
<width>66</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_id_t</name>
<visible>1</visible>
<font>
<face>Liberation Sans</face>
<height>-11</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Ref Ser</text>
<border>6</border>
<color>33554432</color>
<x>1246</x>
<y>2</y>
<height>16</height>
<width>61</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_ser_t</name>
<visible>1</visible>
<font>
<face>Liberation Sans</face>
<height>-11</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Ref No</text>
<border>6</border>
<color>33554432</color>
<x>1309</x>
<y>2</y>
<height>17</height>
<width>69</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_no_t</name>
<visible>1</visible>
<font>
<face>Arial Unicode MS</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>128</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
......@@ -774,10 +669,10 @@
<band>Detail</band>
<id>13</id>
<alignment>0</alignment>
<tabsequence>130</tabsequence>
<tabsequence>40</tabsequence>
<border>5</border>
<color>33554432</color>
<x>975</x>
<x>195</x>
<y>2</y>
<height>16</height>
<width>59</width>
......@@ -810,13 +705,13 @@
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>140</tabsequence>
<tabsequence>50</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1036</x>
<x>256</x>
<y>2</y>
<height>16</height>
<width>140</width>
<width>196</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -844,12 +739,12 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>5</id>
<id>4</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<tabsequence>60</tabsequence>
<border>5</border>
<color>33554432</color>
<x>314</x>
<x>454</x>
<y>1</y>
<height>16</height>
<width>58</width>
......@@ -882,12 +777,12 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>6</id>
<id>5</id>
<alignment>0</alignment>
<tabsequence>60</tabsequence>
<tabsequence>70</tabsequence>
<border>5</border>
<color>33554432</color>
<x>374</x>
<x>514</x>
<y>1</y>
<height>16</height>
<width>80</width>
......@@ -920,12 +815,12 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>7</id>
<id>6</id>
<alignment>0</alignment>
<tabsequence>70</tabsequence>
<tabsequence>80</tabsequence>
<border>5</border>
<color>33554432</color>
<x>456</x>
<x>596</x>
<y>1</y>
<height>16</height>
<width>94</width>
......@@ -958,15 +853,15 @@
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>4</id>
<id>7</id>
<alignment>0</alignment>
<tabsequence>40</tabsequence>
<tabsequence>90</tabsequence>
<border>5</border>
<color>33554432</color>
<x>195</x>
<x>692</x>
<y>1</y>
<height>16</height>
<width>117</width>
<width>366</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -998,10 +893,10 @@
<band>Detail</band>
<id>8</id>
<alignment>0</alignment>
<tabsequence>80</tabsequence>
<tabsequence>100</tabsequence>
<border>5</border>
<color>33554432</color>
<x>552</x>
<x>1060</x>
<y>1</y>
<height>16</height>
<width>66</width>
......@@ -1036,10 +931,10 @@
<band>Detail</band>
<id>9</id>
<alignment>0</alignment>
<tabsequence>90</tabsequence>
<tabsequence>110</tabsequence>
<border>5</border>
<color>33554432</color>
<x>620</x>
<x>1128</x>
<y>1</y>
<height>16</height>
<width>69</width>
......@@ -1074,10 +969,10 @@
<band>Detail</band>
<id>10</id>
<alignment>0</alignment>
<tabsequence>100</tabsequence>
<tabsequence>120</tabsequence>
<border>5</border>
<color>33554432</color>
<x>691</x>
<x>1199</x>
<y>1</y>
<height>16</height>
<width>96</width>
......@@ -1112,10 +1007,10 @@
<band>Detail</band>
<id>11</id>
<alignment>0</alignment>
<tabsequence>110</tabsequence>
<tabsequence>130</tabsequence>
<border>5</border>
<color>33554432</color>
<x>789</x>
<x>1297</x>
<y>1</y>
<height>16</height>
<width>91</width>
......@@ -1149,10 +1044,10 @@
<band>Detail</band>
<id>12</id>
<alignment>0</alignment>
<tabsequence>120</tabsequence>
<tabsequence>140</tabsequence>
<border>5</border>
<color>33554432</color>
<x>882</x>
<x>1390</x>
<y>1</y>
<height>16</height>
<width>91</width>
......@@ -1182,114 +1077,6 @@
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>15</id>
<alignment>0</alignment>
<tabsequence>150</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1178</x>
<y>1</y>
<height>16</height>
<width>66</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_id</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>160</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1246</x>
<y>1</y>
<height>16</height>
<width>61</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_ser</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>17</id>
<alignment>0</alignment>
<tabsequence>170</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1309</x>
<y>2</y>
<height>15</height>
<width>69</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ref_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>16777215</color>
</background>
</ColumnObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......@@ -1308,12 +1095,6 @@
<includewhitespace>0</includewhitespace>
<metadatatype>0</metadatatype>
<savemetadata>0</savemetadata>
<Template>
<comment></comment>
<encoding>UTF-8</encoding>
<name>d_inv_hold</name>
<xml>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;d_inv_hold11&gt;&lt;d_inv_hold11_row __pbband=&quot;detail&quot;&gt;&lt;tran_id&gt;tran_id&lt;/tran_id&gt;&lt;tran_date&gt;tran_date&lt;/tran_date&gt;&lt;site_code&gt;site_code&lt;/site_code&gt;&lt;confirmed&gt;confirmed&lt;/confirmed&gt;&lt;conf_date&gt;conf_date&lt;/conf_date&gt;&lt;emp_code__aprv&gt;emp_code__aprv&lt;/emp_code__aprv&gt;&lt;remarks&gt;remarks&lt;/remarks&gt;&lt;chg_user&gt;chg_user&lt;/chg_user&gt;&lt;chg_date&gt;chg_date&lt;/chg_date&gt;&lt;chg_term&gt;chg_term&lt;/chg_term&gt;&lt;dept_code&gt;dept_code&lt;/dept_code&gt;&lt;role_code&gt;role_code&lt;/role_code&gt;&lt;lock_code&gt;lock_code&lt;/lock_code&gt;&lt;lock_descr&gt;lock_descr&lt;/lock_descr&gt;&lt;ref_id&gt;ref_id&lt;/ref_id&gt;&lt;ref_ser&gt;ref_ser&lt;/ref_ser&gt;&lt;asn_no/&gt;&lt;/d_inv_hold11_row&gt;&lt;/d_inv_hold11&gt;</xml>
</Template>
</Export.XML>
<Import.XML>
</Import.XML>
......
......@@ -19,7 +19,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes key=yes name=tran_i
column=(type=char(10) update=yes updatewhereclause=yes name=role_code dbname="inv_hold.role_code" )
column=(type=char(10) update=yes updatewhereclause=yes name=lock_code dbname="inv_hold.lock_code" )
column=(type=char(60) updatewhereclause=yes name=lock_descr dbname="inv_lock.descr" )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"inv_hold~" ) TABLE(NAME=~"inv_lock~" ) COLUMN(NAME=~"inv_hold.tran_id~") COLUMN(NAME=~"inv_hold.tran_date~") COLUMN(NAME=~"inv_hold.site_code~") COLUMN(NAME=~"inv_hold.confirmed~") COLUMN(NAME=~"inv_hold.conf_date~") COLUMN(NAME=~"inv_hold.emp_code__aprv~") COLUMN(NAME=~"inv_hold.remarks~") COLUMN(NAME=~"inv_hold.chg_user~") COLUMN(NAME=~"inv_hold.chg_date~") COLUMN(NAME=~"inv_hold.chg_term~") COLUMN(NAME=~"inv_hold.dept_code~") COLUMN(NAME=~"inv_hold.role_code~") COLUMN(NAME=~"inv_hold.lock_code~") COLUMN(NAME=~"inv_lock.descr~") JOIN (LEFT=~"inv_hold.lock_code~" OP =~"=~"RIGHT=~"inv_lock.lock_code~" )WHERE( EXP1 =~"inv_hold.tran_date~" OP =~">=~" EXP2 =~":period_from~" LOGIC =~"And~" ) WHERE( EXP1 =~"inv_hold.tran_date~" OP =~"<=~" EXP2 =~":period_to~" ) ) ARG(NAME = ~"period_from~" TYPE = datetime) ARG(NAME = ~"period_to~" TYPE = datetime) " update="inv_hold" updatewhere=0 updatekeyinplace=no arguments=(("period_from", datetime),("period_to", datetime)) )
retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"inv_hold~" ) TABLE(NAME=~"inv_lock~" ) COLUMN(NAME=~"inv_hold.tran_id~") COLUMN(NAME=~"inv_hold.tran_date~") COLUMN(NAME=~"inv_hold.site_code~") COLUMN(NAME=~"inv_hold.confirmed~") COLUMN(NAME=~"inv_hold.conf_date~") COLUMN(NAME=~"inv_hold.emp_code__aprv~") COLUMN(NAME=~"inv_hold.remarks~") COLUMN(NAME=~"inv_hold.chg_user~") COLUMN(NAME=~"inv_hold.chg_date~") COLUMN(NAME=~"inv_hold.chg_term~") COLUMN(NAME=~"inv_hold.dept_code~") COLUMN(NAME=~"inv_hold.role_code~") COLUMN(NAME=~"inv_hold.lock_code~") COLUMN(NAME=~"inv_lock.descr~") JOIN (LEFT=~"inv_lock.lock_code~" OP =~"=~"RIGHT=~"inv_hold.lock_code~" OUTER2 =~"inv_hold.lock_code~" )WHERE( EXP1 =~"inv_hold.tran_date~" OP =~">=~" EXP2 =~":period_from~" LOGIC =~"And~" ) WHERE( EXP1 =~"inv_hold.tran_date~" OP =~"<=~" EXP2 =~":period_to~" ) ) ARG(NAME = ~"period_from~" TYPE = datetime) ARG(NAME = ~"period_to~" TYPE = datetime) " update="inv_hold" updatewhere=0 updatekeyinplace=no arguments=(("period_from", datetime),("period_to", datetime)) )
text(band=header alignment="0" text="Tran Id" border="6" color="33554432" x="2" y="2" height="16" width="66" html.valueishtml="0" name=tran_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" )
text(band=header alignment="0" text="Tran Date" border="6" color="33554432" x="70" y="2" height="16" width="64" 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="1" background.color="536870912" )
text(band=header alignment="0" text="Site Code" border="6" color="33554432" x="136" y="2" height="16" width="57" html.valueishtml="0" name=site_code_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" )
......
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