Skip to content

B
business-java
Commit 0eec72ca authored by ppatro's avatar ppatro
Browse files
Options

Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96976 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cffe5512
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 68 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ 0eec72ca
......@@ -262,9 +262,11 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
pstmt.setString(4,transporterTo);
pstmt.setString(5,shipmentType); */
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
// changed by sankara on 01/10/14 for site transporter
// getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
//getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
" WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
" AND S.TRAN_CODE = T.TRAN_CODE " +
" AND D.REF_SER = 'S-DSP' " +
......@@ -298,7 +300,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
" AND T.SERVICE_CODE IS NOT NULL " +
" AND C.TRACKING_NO IS NOT NULL " +
" AND D.PTCN IS NULL " +*/
" SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIPMENT_CONTENT P, "+
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
// " SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIPMENT_CONTENT P, "+
" SELECT DISTINCT '' AS PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIPMENT_CONTENT P, "+
// changed by sankara on 01/10/14 for site transporter start.
// " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
......@@ -321,7 +325,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//changed by sankara on 04/02/2014 for wms live end.
" AND P.CARTON_NO = C.CARTON_NO " +
" UNION " + //MANUAL SHIPMENT REF SER = "" AND INVENTORY
" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
//Changed by wasim on 16/12/14 start S.SHIPMENT_DATE & S.CONF_DATE are added in query
//" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
" SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME, S.SHIPMENT_DATE, S.CONF_DATE FROM SHIP_DOCS D, SHIPMENT_CONTENT P, "+
//changed by sankara on 01/10/14 for site transporter
//" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
" SHIPMENT S, TRANSPORTER T, CARTON_MASTER C, SITE_TRANSPORTER ST " +
......@@ -373,6 +379,10 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
test.append( "<ptcn><![CDATA[" ).append(ptcn).append( "]]></ptcn>\r\n" );
test.append( "<shipment_id><![CDATA[" ).append(rs.getString(2)).append( "]]></shipment_id>\r\n" );
test.append( "<tran_name><![CDATA[" ).append(rs.getString(3)).append( "]]></tran_name>\r\n" );
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start
test.append( "<conf_date><![CDATA[" ).append(rs.getDate(4)).append("]]></conf_date>\r\n");
test.append( "<ship_date><![CDATA[" ).append(rs.getDate(5)).append("]]></ship_date>\r\n");
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end
test.append("\n");
test.append( "</Detail2>\r\n" );
}
......
webitm-wms/module-resource/metadata/ptcn_confirm12.xml
View file @ 0eec72ca
......@@ -5,7 +5,7 @@
<BaseDefinition>
<units>1</units>
<timer_interval>0</timer_interval>
<color>67108864</color>
<color>1073741824</color>
<processing>1</processing>
<HTMLDW>no</HTMLDW>
<print>
......@@ -36,7 +36,7 @@
<color>536870912</color>
</Header>
<Summary>
<height>1</height>
<height>0</height>
<color>536870912</color>
</Summary>
<Footer>
......@@ -44,124 +44,192 @@
<color>536870912</color>
</Footer>
<Detail>
<height>22</height>
<height>23</height>
<color>536870912</color>
</Detail>
<TableDefinition>
<table_column>
<type size="10">char</type>
<updatewhereclause>no</updatewhereclause>
<updatewhereclause>yes</updatewhereclause>
<name>ptcn</name>
<dbname>ptcn</dbname>
</table_column>
<table_column>
<type size="10">char</type>
<updatewhereclause>no</updatewhereclause>
<updatewhereclause>yes</updatewhereclause>
<name>shipment_id</name>
<dbname>shipment_id</dbname>
</table_column>
<table_column>
<type size="40">char</type>
<updatewhereclause>no</updatewhereclause>
<type size="10">char</type>
<updatewhereclause>yes</updatewhereclause>
<name>tran_name</name>
<dbname>tran_name</dbname>
</table_column>
<table_column>
<type>date</type>
<updatewhereclause>yes</updatewhereclause>
<name>conf_date</name>
<dbname>conf_date</dbname>
</table_column>
<table_column>
<type size="10">char</type>
<updatewhereclause>yes</updatewhereclause>
<name>shipment_date</name>
<dbname>shipment_date</dbname>
</table_column>
</TableDefinition>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>PTCN</text>
<alignment>2</alignment>
<text>Ptcn</text>
<border>6</border>
<color>0</color>
<color>33554432</color>
<x>2</x>
<y>2</y>
<height>16</height>
<width>165</width>
<width>60</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>ptcn_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<alignment>2</alignment>
<text>Shipment Id</text>
<border>6</border>
<color>0</color>
<x>169</x>
<color>33554432</color>
<x>64</x>
<y>2</y>
<height>16</height>
<width>144</width>
<width>90</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>shipment_id_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Transporter Name</text>
<alignment>2</alignment>
<text>Tran Name</text>
<border>6</border>
<color>0</color>
<x>315</x>
<color>33554432</color>
<x>156</x>
<y>2</y>
<height>16</height>
<width>841</width>
<width>211</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>tran_name_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>1</mode>
<color>553648127</color>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Conf Date</text>
<border>6</border>
<color>33554432</color>
<x>369</x>
<y>2</y>
<height>16</height>
<width>88</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>conf_date_t</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>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Shipment Date</text>
<border>6</border>
<color>33554432</color>
<x>459</x>
<y>2</y>
<height>16</height>
<width>113</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>shipment_date_t</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>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>1</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<tabsequence>10</tabsequence>
<border>0</border>
<color>33554432</color>
<x>2</x>
<y>2</y>
<height>19</height>
<width>165</width>
<width>60</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -177,10 +245,10 @@
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
......@@ -193,13 +261,13 @@
<band>Detail</band>
<id>2</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<tabsequence>20</tabsequence>
<border>0</border>
<color>33554432</color>
<x>169</x>
<x>64</x>
<y>2</y>
<height>19</height>
<width>144</width>
<width>90</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -209,33 +277,35 @@
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>3</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<tabsequence>30</tabsequence>
<border>0</border>
<color>33554432</color>
<x>315</x>
<x>156</x>
<y>2</y>
<height>19</height>
<width>841</width>
<width>211</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -245,20 +315,98 @@
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</face>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
<mode>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>4</id>
<alignment>0</alignment>
<tabsequence>40</tabsequence>
<border>0</border>
<color>33554432</color>
<x>369</x>
<y>2</y>
<height>19</height>
<width>88</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>conf_date</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<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>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>5</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<border>0</border>
<color>33554432</color>
<x>459</x>
<y>2</y>
<height>19</height>
<width>113</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>shipment_date</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<focusrectangle>no</focusrectangle>
<autoselect>yes</autoselect>
<autohscroll>yes</autohscroll>
<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>1</mode>
<color>536870912</color>
</background>
</ColumnObject>
<HtmlTable>
......
webitm-wms/module-resource/srd/d_ptcn_confirm12.srd
View file @ 0eec72ca
$PBExportHeader$d_ptcn12.srd
release 9;
datawindow(units=1 timer_interval=0 color=67108864 processing=1 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no grid.lines=0 )
datawindow(units=1 timer_interval=0 color=1073741824 processing=1 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no grid.lines=0 )
header(height=20 color="536870912" )
summary(height=1 color="536870912" )
summary(height=0 color="536870912" )
footer(height=0 color="536870912" )
detail(height=22 color="536870912" )
table(column=(type=char(10) updatewhereclause=no name=ptcn dbname="ptcn" )
column=(type=char(10) updatewhereclause=no name=shipment_id dbname="shipment_id" )
column=(type=char(40) updatewhereclause=no name=tran_name dbname="tran_name" )
detail(height=23 color="536870912" )
table(column=(type=char(10) updatewhereclause=yes name=ptcn dbname="ptcn" )
column=(type=char(10) updatewhereclause=yes name=shipment_id dbname="shipment_id" )
column=(type=char(10) updatewhereclause=yes name=tran_name dbname="tran_name" )
column=(type=date updatewhereclause=yes name=conf_date dbname="conf_date" )
column=(type=char(10) updatewhereclause=yes name=shipment_date dbname="shipment_date" )
)
text(band=header alignment="0" text="PTCN" border="6" color="0" x="2" y="2" height="16" width="165" html.valueishtml="0" name=ptcn_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="553648127" )
text(band=header alignment="0" text="Shipment Id" border="6" color="0" x="169" y="2" height="16" width="144" html.valueishtml="0" name=shipment_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="553648127" )
text(band=header alignment="0" text="Transporter Name" border="6" color="0" x="315" y="2" height="16" width="841" html.valueishtml="0" name=tran_name_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="553648127" )
column(band=detail id=1 alignment="0" tabsequence=32766 border="5" color="33554432" x="2" y="2" height="19" width="165" format="[general]" html.valueishtml="0" name=ptcn visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 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" )
column(band=detail id=2 alignment="0" tabsequence=32766 border="5" color="33554432" x="169" y="2" height="19" width="144" format="[general]" html.valueishtml="0" name=shipment_id visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
column(band=detail id=3 alignment="0" tabsequence=32766 border="5" color="33554432" x="315" y="2" height="19" width="841" format="[general]" html.valueishtml="0" name=tran_name visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0 font.face="Times New Roman" font.height="-10" font.weight="400" font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
text(band=header alignment="2" text="Ptcn" border="6" color="33554432" x="2" y="2" height="16" width="60" html.valueishtml="0" name=ptcn_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="2" text="Shipment Id" border="6" color="33554432" x="64" y="2" height="16" width="90" html.valueishtml="0" name=shipment_id_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="2" text="Tran Name" border="6" color="33554432" x="156" y="2" height="16" width="211" html.valueishtml="0" name=tran_name_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="2" text="Conf Date" border="6" color="33554432" x="369" y="2" height="16" width="88" html.valueishtml="0" name=conf_date_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
text(band=header alignment="2" text="Shipment Date" border="6" color="33554432" x="459" y="2" height="16" width="113" html.valueishtml="0" name=shipment_date_t visible="1" font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
column(band=detail id=1 alignment="0" tabsequence=10 border="0" color="33554432" x="2" y="2" height="19" width="60" format="[general]" html.valueishtml="0" name=ptcn visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=2 alignment="0" tabsequence=20 border="0" color="33554432" x="64" y="2" height="19" width="90" format="[general]" html.valueishtml="0" name=shipment_id visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=3 alignment="0" tabsequence=30 border="0" color="33554432" x="156" y="2" height="19" width="211" format="[general]" html.valueishtml="0" name=tran_name visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=4 alignment="0" tabsequence=40 border="0" color="33554432" x="369" y="2" height="19" width="88" format="[general]" html.valueishtml="0" name=conf_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
column(band=detail id=5 alignment="0" tabsequence=50 border="0" color="33554432" x="459" y="2" height="19" width="113" format="[general]" html.valueishtml="0" name=shipment_date visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0 font.face="Arial" font.height="-10" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0 )
......
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