Skip to content

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

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


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97010 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3d46d563
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ bb42484e
......@@ -379,8 +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(checkNull(rs.getString("SHIPMENT_ID"))).append( "]]></shipment_id>\r\n" );
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.start
test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n");
test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n");
//test.append( "<ship_date><![CDATA[" ).append(rs.getDate("SHIPMENT_DATE")).append("]]></ship_date>\r\n");
test.append( "<ship_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("SHIPMENT_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></ship_date>\r\n");
//test.append( "<conf_date><![CDATA[" ).append(rs.getDate("CONF_DATE")).append("]]></conf_date>\r\n");
test.append( "<conf_date><![CDATA[" ).append(genericUtility.getValidDateString(String.valueOf(rs.getDate("CONF_DATE")),genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat())).append("]]></conf_date>\r\n");
//Changed by wasim on 16/12/14 start append columns conf_date and ship_date.end
test.append( "<tran_name><![CDATA[" ).append(checkNull(rs.getString("TRAN_NAME"))).append( "]]></tran_name>\r\n" );
test.append("\n");
......
webitm-wms/module-resource/metadata/ptcn_confirm12.xml
View file @ bb42484e
......@@ -166,7 +166,7 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Conf Date</text>
<text>Confirm Date</text>
<border>0</border>
<color>33554432</color>
<x>287</x>
......@@ -194,13 +194,13 @@
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Tran Name</text>
<text>Transporter Name</text>
<border>0</border>
<color>33554432</color>
<x>388</x>
<y>2</y>
<height>15</height>
<width>102</width>
<width>116</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -381,7 +381,7 @@
<x>388</x>
<y>2</y>
<height>18</height>
<width>102</width>
<width>116</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......
webitm-wms/module-resource/srd/d_ptcn_confirm12.srd
View file @ bb42484e
......@@ -14,13 +14,13 @@ table(column=(type=char(10) updatewhereclause=yes name=ptcn dbname="ptcn" )
text(band=header alignment="2" text="PTCN" border="0" color="33554432" x="2" y="2" height="15" width="79" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Shipment Id" border="0" color="33554432" x="83" y="2" height="15" width="88" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Shipment Date" border="0" color="33554432" x="173" y="2" height="15" width="112" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Conf Date" border="0" color="33554432" x="287" y="2" height="15" width="99" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Tran Name" border="0" color="33554432" x="388" y="2" height="15" width="102" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Confirm Date" border="0" color="33554432" x="287" y="2" height="15" width="99" 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="1" background.color="536870912" )
text(band=header alignment="2" text="Transporter Name" border="0" color="33554432" x="388" y="2" height="15" width="116" 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="1" background.color="536870912" )
column(band=detail id=1 alignment="0" tabsequence=32766 border="0" color="33554432" x="2" y="2" height="18" width="79" 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="2" background.color="16777215" )
column(band=detail id=2 alignment="0" tabsequence=32766 border="0" color="33554432" x="83" y="2" height="18" width="88" 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="2" background.color="16777215" )
column(band=detail id=3 alignment="0" tabsequence=32766 border="0" color="33554432" x="173" y="2" height="18" width="112" 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="2" background.color="16777215" )
column(band=detail id=4 alignment="0" tabsequence=32766 border="0" color="33554432" x="287" y="2" height="18" width="99" 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="2" background.color="16777215" )
column(band=detail id=5 alignment="0" tabsequence=32766 border="0" color="33554432" x="388" y="2" height="18" width="102" 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="2" background.color="16777215" )
column(band=detail id=5 alignment="0" tabsequence=32766 border="0" color="33554432" x="388" y="2" height="18" width="116" 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="2" background.color="16777215" )
compute(band=footer alignment="0" expression=" ptcn "border="0" color="33554432" x="287" y="64" height="16" width="99" format="[GENERAL]" html.valueishtml="0" name=compute_1 visible="1" font.face="Arial" font.height="-11" font.weight="400" font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
htmltable(border="1" )
htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="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