Commit d2ca9bf4 authored by kmandhre's avatar kmandhre

changes received from sun merged


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91760 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8563856b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<color>536870912</color> <color>536870912</color>
</Footer> </Footer>
<Detail> <Detail>
<height>389</height> <height>444</height>
<color>536870912</color> <color>536870912</color>
</Detail> </Detail>
<TableDefinition> <TableDefinition>
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
<type size="8">char</type> <type size="8">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>loc_code</name> <name>loc_code</name>
<dbname>location.loc_code</dbname> <dbname>location.loc_code</dbname>
</table_column> </table_column>
...@@ -55,6 +54,7 @@ ...@@ -55,6 +54,7 @@
<type size="40">char</type> <type size="40">char</type>
<update>yes</update> <update>yes</update>
<updatewhereclause>yes</updatewhereclause> <updatewhereclause>yes</updatewhereclause>
<key>yes</key>
<name>descr</name> <name>descr</name>
<dbname>location.descr</dbname> <dbname>location.descr</dbname>
</table_column> </table_column>
...@@ -262,8 +262,29 @@ ...@@ -262,8 +262,29 @@
<item display="No" data="N"/> <item display="No" data="N"/>
</values> </values>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;location&quot; ) TABLE(NAME=&quot;invstat&quot; ) COLUMN(NAME=&quot;location.loc_code&quot;) COLUMN(NAME=&quot;location.descr&quot;) COLUMN(NAME=&quot;location.sh_descr&quot;) COLUMN(NAME=&quot;location.loc_type&quot;) COLUMN(NAME=&quot;location.inv_stat&quot;) COLUMN(NAME=&quot;location.one_item&quot;) COLUMN(NAME=&quot;location.capacity&quot;) COLUMN(NAME=&quot;location.cap_uom&quot;) COLUMN(NAME=&quot;location.loc_group&quot;) COLUMN(NAME=&quot;location.temp&quot;) COLUMN(NAME=&quot;location.chg_date&quot;) COLUMN(NAME=&quot;location.chg_user&quot;) COLUMN(NAME=&quot;location.chg_term&quot;) COLUMN(NAME=&quot;location.site_code&quot;) COLUMN(NAME=&quot;invstat.descr&quot;) COLUMN(NAME=&quot;location.item_code&quot;) COLUMN(NAME=&quot;location.eff_from&quot;) COLUMN(NAME=&quot;location.valid_upto&quot;) COLUMN(NAME=&quot;location.hire_charge&quot;) COLUMN(NAME=&quot;location.usable&quot;) COLUMN(NAME=&quot;location.site_code__own&quot;) COLUMN(NAME=&quot;location.zone&quot;) COLUMN(NAME=&quot;location.pallet_based&quot;) COLUMN(NAME=&quot;location.item_lot_opt&quot;) COLUMN(NAME=&quot;location.cycle_count_reqd&quot;) COLUMN(NAME=&quot;location.single_lot_sl&quot;) JOIN (LEFT=&quot;location.inv_stat&quot; OP =&quot;=&quot;RIGHT=&quot;invstat.inv_stat&quot; OUTER1 =&quot;location.inv_stat&quot; )WHERE( EXP1 =&quot;( LOCATION.LOC_CODE&quot; OP =&quot;=&quot; EXP2 =&quot;:LC )&quot; ) ) ARG(NAME = &quot;LC&quot; TYPE = string) </retrieve> <table_column>
<update>location</update> <type size="1">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>phy_han_basis</name>
<dbname>location.phy_han_basis</dbname>
<initial>L</initial>
<values>
<item display="Lot Wise Shipper" data="L"/>
<item display="Integral Quantity" data="I"/>
<item display="UOM" data="U"/>
<item display="Pallet Basis" data="P"/>
</values>
</table_column>
<table_column>
<type size="3">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>phy_han_uom</name>
<dbname>location.phy_han_uom</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;location&quot; ) TABLE(NAME=&quot;invstat&quot; ) COLUMN(NAME=&quot;location.loc_code&quot;) COLUMN(NAME=&quot;location.descr&quot;) COLUMN(NAME=&quot;location.sh_descr&quot;) COLUMN(NAME=&quot;location.loc_type&quot;) COLUMN(NAME=&quot;location.inv_stat&quot;) COLUMN(NAME=&quot;location.one_item&quot;) COLUMN(NAME=&quot;location.capacity&quot;) COLUMN(NAME=&quot;location.cap_uom&quot;) COLUMN(NAME=&quot;location.loc_group&quot;) COLUMN(NAME=&quot;location.temp&quot;) COLUMN(NAME=&quot;location.chg_date&quot;) COLUMN(NAME=&quot;location.chg_user&quot;) COLUMN(NAME=&quot;location.chg_term&quot;) COLUMN(NAME=&quot;location.site_code&quot;) COLUMN(NAME=&quot;invstat.descr&quot;) COLUMN(NAME=&quot;location.item_code&quot;) COLUMN(NAME=&quot;location.eff_from&quot;) COLUMN(NAME=&quot;location.valid_upto&quot;) COLUMN(NAME=&quot;location.hire_charge&quot;) COLUMN(NAME=&quot;location.usable&quot;) COLUMN(NAME=&quot;location.site_code__own&quot;) COLUMN(NAME=&quot;location.zone&quot;) COLUMN(NAME=&quot;location.pallet_based&quot;) COLUMN(NAME=&quot;location.item_lot_opt&quot;) COLUMN(NAME=&quot;location.cycle_count_reqd&quot;) COLUMN(NAME=&quot;location.single_lot_sl&quot;) COLUMN(NAME=&quot;location.phy_han_basis&quot;) COLUMN(NAME=&quot;location.phy_han_uom&quot;) JOIN (LEFT=&quot;location.inv_stat&quot; OP =&quot;=&quot;RIGHT=&quot;invstat.inv_stat&quot; OUTER1 =&quot;location.inv_stat&quot; )WHERE( EXP1 =&quot;( LOCATION.LOC_CODE&quot; OP =&quot;=&quot; EXP2 =&quot;:LC )&quot; ) ) ARG(NAME = &quot;LC&quot; TYPE = string) </retrieve>
<update>LOCATION</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -1422,22 +1443,78 @@ ...@@ -1422,22 +1443,78 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Single LPN only :</text>
<border>0</border>
<color>0</color>
<x>276</x>
<y>334</y>
<height>16</height>
<width>219</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>single_lpn_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>536870912</color>
</background>
</TextObject>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Cycle Count Required :</text>
<border>0</border>
<color>0</color>
<x>384</x>
<y>366</y>
<height>16</height>
<width>134</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>cycle_count_reqd_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>536870912</color>
</background>
</TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>24</id> <id>20</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>210</tabsequence> <tabsequence>160</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>206</x> <x>524</x>
<y>367</y> <y>271</y>
<height>16</height> <height>16</height>
<width>173</width> <width>55</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>item_lot_opt</name> <name>usable</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb"> <EditStyle style="ddlb">
<limit>0</limit> <limit>0</limit>
...@@ -1455,24 +1532,70 @@ ...@@ -1455,24 +1532,70 @@
</font> </font>
<background> <background>
<mode>2</mode> <mode>2</mode>
<color>16777215</color> <color>1090519039</color>
</background> </background>
</ColumnObject> </ColumnObject>
<TextObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <id>22</id>
<text>Pallet Based :</text> <alignment>0</alignment>
<border>0</border> <tabsequence>180</tabsequence>
<border>5</border>
<color>0</color> <color>0</color>
<x>3</x> <x>524</x>
<y>303</y>
<height>16</height>
<width>55</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>zone</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>3</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>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>1073741824</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>26</id>
<alignment>0</alignment>
<tabsequence>200</tabsequence>
<border>5</border>
<color>0</color>
<x>500</x>
<y>335</y> <y>335</y>
<height>16</height> <height>16</height>
<width>199</width> <width>79</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>pallet_based_t</name> <name>single_lot_sl</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -1482,24 +1605,60 @@ ...@@ -1482,24 +1605,60 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>1</mode> <mode>2</mode>
<color>536870912</color> <color>16777215</color>
</background> </background>
</TextObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>24</id>
<alignment>0</alignment>
<tabsequence>210</tabsequence>
<border>5</border>
<color>0</color>
<x>206</x>
<y>367</y>
<height>16</height>
<width>173</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>item_lot_opt</name>
<visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Item / Lot allowed :</text> <text>Pallet Based :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>4</x> <x>3</x>
<y>366</y> <y>335</y>
<height>16</height> <height>16</height>
<width>198</width> <width>199</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>item_lot_opt_t</name> <name>pallet_based_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1517,17 +1676,17 @@ ...@@ -1517,17 +1676,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Single LPN only :</text> <text>Item / Lot allowed :</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>276</x> <x>4</x>
<y>334</y> <y>366</y>
<height>16</height> <height>16</height>
<width>219</width> <width>198</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>single_lpn_t</name> <name>item_lot_opt_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1545,17 +1704,17 @@ ...@@ -1545,17 +1704,17 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Cycle Count Required :</text> <text>Physical Handle Basis:</text>
<border>0</border> <border>0</border>
<color>0</color> <color>0</color>
<x>384</x> <x>4</x>
<y>366</y> <y>397</y>
<height>16</height> <height>16</height>
<width>134</width> <width>198</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>cycle_count_reqd_t</name> <name>phy_han_basis_t</name>
<visible>1</visible> <visible>1</visible>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
...@@ -1572,20 +1731,20 @@ ...@@ -1572,20 +1731,20 @@
</TextObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>25</id> <id>27</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>220</tabsequence> <tabsequence>230</tabsequence>
<border>5</border> <border>0</border>
<color>0</color> <color>0</color>
<x>523</x> <x>206</x>
<y>367</y> <y>397</y>
<height>16</height> <height>16</height>
<width>57</width> <width>173</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>cycle_count_reqd</name> <name>phy_han_basis</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb"> <EditStyle style="ddlb">
<limit>0</limit> <limit>0</limit>
...@@ -1606,29 +1765,21 @@ ...@@ -1606,29 +1765,21 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<id>20</id> <alignment>1</alignment>
<alignment>0</alignment> <text>Physical handle UOM :</text>
<tabsequence>160</tabsequence> <border>0</border>
<border>5</border>
<color>0</color> <color>0</color>
<x>524</x> <x>384</x>
<y>271</y> <y>397</y>
<height>16</height> <height>16</height>
<width>55</width> <width>134</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>usable</name> <name>t_1</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
...@@ -1638,33 +1789,31 @@ ...@@ -1638,33 +1789,31 @@
<charset>0</charset> <charset>0</charset>
</font> </font>
<background> <background>
<mode>2</mode> <mode>1</mode>
<color>1090519039</color> <color>536870912</color>
</background> </background>
</ColumnObject> </TextObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>22</id> <id>25</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>180</tabsequence> <tabsequence>220</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>524</x> <x>523</x>
<y>303</y> <y>367</y>
<height>16</height> <height>16</height>
<width>55</width> <width>57</width>
<format>[general]</format> <format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>zone</name> <name>cycle_count_reqd</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="edit"> <EditStyle style="ddlb">
<limit>3</limit> <limit>0</limit>
<allowedit>no</allowedit>
<case>any</case> <case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode> <imemode>0</imemode>
</EditStyle> </EditStyle>
<font> <font>
...@@ -1677,32 +1826,25 @@ ...@@ -1677,32 +1826,25 @@
</font> </font>
<background> <background>
<mode>2</mode> <mode>2</mode>
<color>1073741824</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject> <ColumnObject>
<band>Detail</band> <band>Detail</band>
<id>26</id> <id>28</id>
<alignment>0</alignment> <alignment>0</alignment>
<tabsequence>200</tabsequence> <tabsequence>240</tabsequence>
<border>5</border> <border>5</border>
<color>0</color> <color>0</color>
<x>500</x> <x>523</x>
<y>335</y> <y>397</y>
<height>16</height> <height>16</height>
<width>79</width> <width>57</width>
<format>[general]</format>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
<name>single_lot_sl</name> <name>phy_han_uom</name>
<visible>1</visible> <visible>1</visible>
<EditStyle style="ddlb">
<limit>0</limit>
<allowedit>no</allowedit>
<case>any</case>
<imemode>0</imemode>
</EditStyle>
<font> <font>
<face>Times New Roman</face> <face>Times New Roman</face>
<height>-10</height> <height>-10</height>
......
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