Skip to content

B
business-java
Commit 0588608f authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 27/09/13 updated source from manoj sharma and pragyan 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93678 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f96658ce
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 139 deletions
webitm-wms/ibase/webitm/ejb/wms/ExpStockTransferIC.java
View file @ 0588608f
...@@ -538,13 +538,20 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer ...@@ -538,13 +538,20 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
else else
{ {
sql = "SELECT A.LOC_CODE AS LOC_CODE FROM LOCATION A, INVSTAT B " //Changed By Pragyan as per AShish 27-sep-13 to allow all location to transfer
/*sql = "SELECT A.LOC_CODE AS LOC_CODE FROM LOCATION A, INVSTAT B "
+ " WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " + " WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' "
+ " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " + " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
+ " AND A.INV_STAT = ? AND LOC_CODE = ? "; + " AND A.INV_STAT = ? AND LOC_CODE = ? ";*/
sql = "SELECT A.LOC_CODE AS LOC_CODE FROM LOCATION A, INVSTAT B "
+ " WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' "
+ " AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
// + " AND A.INV_STAT = ? AND LOC_CODE = ? ";
+ " AND LOC_CODE = ? ";
pstmtLoc = conn.prepareStatement(sql); pstmtLoc = conn.prepareStatement(sql);
if( "EXP_LOCK".equalsIgnoreCase(locType)) //Changed By Pragyan as per AShish 27-sep-13 to allow all location to transfer.start
/*if( "EXP_LOCK".equalsIgnoreCase(locType))
{ {
pstmtLoc.setString(1, exprInvstat); pstmtLoc.setString(1, exprInvstat);
} }
...@@ -552,8 +559,10 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer ...@@ -552,8 +559,10 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
{ {
pstmtLoc.setString(1, nexprInvstat); pstmtLoc.setString(1, nexprInvstat);
} }
pstmtLoc.setString(2, locCodeCurr); pstmtLoc.setString(2, locCodeCurr);*/
pstmtLoc.setString(1, locCodeCurr);
rsLoc = pstmtLoc.executeQuery(); rsLoc = pstmtLoc.executeQuery();
if( rsLoc.next()) if( rsLoc.next())
{ {
...@@ -603,7 +612,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer ...@@ -603,7 +612,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
} }
//Changed by sumit on 17/09/12 commented this checking duplicate inside suggested method start. //Changed by sumit on 17/09/12 commented this checking duplicate inside suggested method start.
/*String locCodeExist = ""; String locCodeExist = "";
NodeList locCodeNodeList = null; NodeList locCodeNodeList = null;
ArrayList dupLocCodeList = new ArrayList(); ArrayList dupLocCodeList = new ArrayList();
...@@ -648,7 +657,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer ...@@ -648,7 +657,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
{ {
errList.add( "DUPLOCCODE" ); errList.add( "DUPLOCCODE" );
errFields.add( childNodeName.toLowerCase() ); errFields.add( childNodeName.toLowerCase() );
}*/ }
//Changed by sumit on 17/09/12 commented this checking duplicate inside suggested method end. //Changed by sumit on 17/09/12 commented this checking duplicate inside suggested method end.
} }
else else
......
webitm-wms/ibase/webitm/ejb/wms/PhyItemScanIC.java
View file @ 0588608f
This source diff could not be displayed because it is too large. You can view the blob instead.
webitm-wms/module-resource/metadata/phy_scan_verify21.xml
View file @ 0588608f
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<dbname>isstock</dbname> <dbname>isstock</dbname>
</table_column> </table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;physcan&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;physcan.tran_id&quot;) COLUMN(NAME=&quot;physcan.tran_date&quot;) COLUMN(NAME=&quot;physcan.site_code&quot;) COLUMN(NAME=&quot;site.descr&quot;) COLUMN(NAME=&quot;physcan.status&quot;) COLUMN(NAME=&quot;physcan.status_date&quot;) COLUMN(NAME=&quot;physcan.confirmed&quot;) COLUMN(NAME=&quot;physcan.remarks&quot;) COLUMN(NAME=&quot;physcan.chg_date&quot;) COLUMN(NAME=&quot;physcan.chg_user&quot;) COLUMN(NAME=&quot;physcan.chg_term&quot;) COLUMN(NAME=&quot;physcan.emp_code__user&quot;) COLUMN(NAME=&quot;physcan.ref_id&quot;) COMPUTE(NAME=&quot;&apos;&apos; loc_code&quot;) COMPUTE(NAME=&quot;&apos;&apos; isempty&quot;) COLUMN(NAME=&quot;physcan.tran_type&quot;) COMPUTE(NAME=&quot;&apos;&apos; isstock&quot;) JOIN (LEFT=&quot;physcan.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;PHYSCAN~&quot;.~&quot;TRAN_ID~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve> <retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;physcan&quot; ) TABLE(NAME=&quot;site&quot; ) COLUMN(NAME=&quot;physcan.tran_id&quot;) COLUMN(NAME=&quot;physcan.tran_date&quot;) COLUMN(NAME=&quot;physcan.site_code&quot;) COLUMN(NAME=&quot;site.descr&quot;) COLUMN(NAME=&quot;physcan.status&quot;) COLUMN(NAME=&quot;physcan.status_date&quot;) COLUMN(NAME=&quot;physcan.confirmed&quot;) COLUMN(NAME=&quot;physcan.remarks&quot;) COLUMN(NAME=&quot;physcan.chg_date&quot;) COLUMN(NAME=&quot;physcan.chg_user&quot;) COLUMN(NAME=&quot;physcan.chg_term&quot;) COLUMN(NAME=&quot;physcan.emp_code__user&quot;) COLUMN(NAME=&quot;physcan.ref_id&quot;) COMPUTE(NAME=&quot;&apos;&apos; loc_code&quot;) COMPUTE(NAME=&quot;&apos;&apos; isempty&quot;) COLUMN(NAME=&quot;physcan.tran_type&quot;) COMPUTE(NAME=&quot;&apos;&apos; isstock&quot;) JOIN (LEFT=&quot;physcan.site_code&quot; OP =&quot;=&quot;RIGHT=&quot;site.site_code&quot; )WHERE( EXP1 =&quot;~&quot;PHYSCAN~&quot;.~&quot;TRAN_ID~&quot;&quot; OP =&quot;=&quot; EXP2 =&quot;:tran_id&quot; ) ) ARG(NAME = &quot;tran_id&quot; TYPE = string) </retrieve>
<update>PHYSCAN</update> <update>physcan</update>
<updatewhere>0</updatewhere> <updatewhere>0</updatewhere>
<updatekeyinplace>no</updatekeyinplace> <updatekeyinplace>no</updatekeyinplace>
<argument> <argument>
...@@ -799,13 +799,13 @@ ...@@ -799,13 +799,13 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Transaction ID:</text> <text>Tran Id:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>9</x> <x>23</x>
<y>11</y> <y>11</y>
<height>16</height> <height>18</height>
<width>87</width> <width>73</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -827,13 +827,13 @@ ...@@ -827,13 +827,13 @@
<TextObject> <TextObject>
<band>Detail</band> <band>Detail</band>
<alignment>1</alignment> <alignment>1</alignment>
<text>Transaction Date:</text> <text>Tran Date:</text>
<border>0</border> <border>0</border>
<color>33554432</color> <color>33554432</color>
<x>280</x> <x>309</x>
<y>11</y> <y>11</y>
<height>16</height> <height>18</height>
<width>102</width> <width>73</width>
<html> <html>
<valueishtml>0</valueishtml> <valueishtml>0</valueishtml>
</html> </html>
...@@ -928,70 +928,6 @@ ...@@ -928,70 +928,6 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>386</x>
<y>33</y>
<height>16</height>
<width>73</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>loc_code</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</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>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Location Code:</text>
<border>0</border>
<color>33554432</color>
<x>276</x>
<y>33</y>
<height>16</height>
<width>106</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>t_1</name>
<visible>1</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</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>11</id> <id>11</id>
...@@ -1166,6 +1102,70 @@ ...@@ -1166,6 +1102,70 @@
<color>16777215</color> <color>16777215</color>
</background> </background>
</ColumnObject> </ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>14</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>0</color>
<x>386</x>
<y>33</y>
<height>16</height>
<width>73</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>loc_code</name>
<visible>0</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</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>
<TextObject>
<band>Detail</band>
<alignment>1</alignment>
<text>Location Code:</text>
<border>0</border>
<color>33554432</color>
<x>297</x>
<y>33</y>
<height>16</height>
<width>85</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>t_1</name>
<visible>0</visible>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>536870912</color>
</background>
</TextObject>
<HtmlTable> <HtmlTable>
<border>1</border> <border>1</border>
</HtmlTable> </HtmlTable>
......
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