changed by sankara on 06-10-14 for site transporter anbd shipment srd

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96536 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsPrc.java

@@ -1240,13 +1240,18 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
+				System.out.println("from site_transporter");
 				shipTranCode = rs.getString("TRAN_CODE");
 				serviceCode = rs.getString("SERVICE_CODE");
 			}
 			else
 			{
+				//changed by sankara on 01/10/14 for site transporter
+				/*sql =  " SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
+						" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE AND T.SITE_CODE = ? ";*/
+				System.out.println("from transporter");
 				sql =  " SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
-						" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE AND T.SITE_CODE = ? ";
+						" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, ptcn);
 				rs = pstmt.executeQuery();

webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java

@@ -261,14 +261,22 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 				pstmt.setString(3,transporterFrom);
 				pstmt.setString(4,transporterTo);
 				pstmt.setString(5,shipmentType);   */
-					getDataSql = " SELECT DISTINCT D.PTCN, S.SHIPMENT_ID, T.TRAN_NAME FROM SHIP_DOCS D, SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
+			
+	            // 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 " +
 							     " WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " +
 							     " AND S.TRAN_CODE = T.TRAN_CODE " +
 							     " AND D.REF_SER = 'S-DSP' " +
 							     " AND S.CONFIRMED = 'Y'  " +
 							     " AND S.CONF_DATE BETWEEN  ? AND  ? " +
 							     " AND S.TRAN_CODE BETWEEN  ? AND  ? " + 
-							     " AND T.SHIPMENT_TYPE = ? " +
+							   // changed by sankara on 01/10/14 for site transporter start. 		  
+							  // " AND T.SHIPMENT_TYPE = ? " +
+							     " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
+							     " AND ST.SITE_CODE(+) = S.SITE_CODE "+
+							     " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
+							 // changed by sankara on 01/10/14 for site transporter end. 	   
 							     " AND D.PTCN = C.PTCN " + 
 							     " AND C.SF_IDENTITY IS NULL " +
 							     " AND T.SERVICE_CODE IS NOT NULL " +
@@ -291,14 +299,21 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							     " 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, "+
-							     " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
+							  // 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 " +
 							     " WHERE S.SHIPMENT_ID NOT IN (SELECT DISTINCT SHIPMENT_ID FROM SHIP_DOCS)" + 
 							     " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
 							     " AND S.TRAN_CODE = T.TRAN_CODE " +
 							     " AND S.CONFIRMED = 'Y' " +
 							     " AND S.CONF_DATE BETWEEN  ?  AND  ? " + 
 							     " AND S.TRAN_CODE BETWEEN  ? AND  ? " +
-							     " AND T.SHIPMENT_TYPE = ? " +
+							     // changed by sankara on 01/10/14 for site transporter start. 		  
+								 // " AND T.SHIPMENT_TYPE = ? " +
+								  " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
+								  " AND ST.SITE_CODE(+) = S.SITE_CODE "+
+								  " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
+								 // changed by sankara on 01/10/14 for site transporter end. 	  
 							     " AND C.SF_IDENTITY IS NULL " + 
 							     " AND T.SERVICE_CODE IS NOT NULL " +
 							     " AND C.TRACKING_NO IS NOT NULL " + 
@@ -307,7 +322,9 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							     " 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, "+
-							     " SHIPMENT S, TRANSPORTER T, CARTON_MASTER C " +
+							     //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 " +
 							     " WHERE D.SHIPMENT_ID = S.SHIPMENT_ID " + 
 							     " AND S.SHIPMENT_ID = P.SHIPMENT_ID " +
 							     " AND D.SHIPMENT_ID = P.SHIPMENT_ID " +
@@ -316,7 +333,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
 							     " AND S.CONF_DATE BETWEEN  ?  AND  ? " +
 							     " AND S.TRAN_CODE BETWEEN  ? AND  ? " +
 							     " AND D.PTCN IS NULL " +
-							     " AND T.SHIPMENT_TYPE = ? " +
+							     // changed by sankara on 01/10/14 for site transporter start. 		  
+								 // " AND T.SHIPMENT_TYPE = ? " +
+								  " AND CASE WHEN ST.SHIPMENT_TYPE IS NULL THEN T.SHIPMENT_TYPE ELSE ST.SHIPMENT_TYPE END = ? "+
+								  " AND ST.SITE_CODE(+) = S.SITE_CODE "+
+								  " AND ST.TRAN_CODE(+) = S.TRAN_CODE "+
+								 // changed by sankara on 01/10/14 for site transporter end. 	  
 							     " AND C.SF_IDENTITY IS NULL " + 
 							     " AND T.SERVICE_CODE IS NOT NULL " +
 								  // changed by sankara on 17/08/13 added join form carton_master for manual ship get data.  

webitm-wms/module-resource/metadata/shipment11.xml

@@ -31,7 +31,7 @@
 		</print>
 	</BaseDefinition>
 	<Header>
-		<height>21</height>
+		<height>22</height>
 		<color>536870912</color>
 	</Header>
 	<Summary>
@@ -39,7 +39,7 @@
 		<color>536870912</color>
 	</Summary>
 	<Footer>
-		<height>0</height>
+		<height>2</height>
 		<color>536870912</color>
 	</Footer>
 	<Detail>
@@ -448,7 +448,21 @@
 			<name>tele1</name>
 			<dbname>shipment.tele1</dbname>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;shipment&quot; ) COLUMN(NAME=&quot;shipment.shipment_id&quot;) COLUMN(NAME=&quot;shipment.shipment_date&quot;) COLUMN(NAME=&quot;shipment.lorry_no&quot;) COLUMN(NAME=&quot;shipment.tran_code&quot;) COLUMN(NAME=&quot;shipment.stan_code__from&quot;) COLUMN(NAME=&quot;shipment.stan_code__to&quot;) COLUMN(NAME=&quot;shipment.freight_amt&quot;) COLUMN(NAME=&quot;shipment.lr_no&quot;) COLUMN(NAME=&quot;shipment.lr_date&quot;) COLUMN(NAME=&quot;shipment.no_of_lr&quot;) COLUMN(NAME=&quot;shipment.bill_no&quot;) COLUMN(NAME=&quot;shipment.bill_date&quot;) COLUMN(NAME=&quot;shipment.call_date&quot;) COLUMN(NAME=&quot;shipment.pick_up_date&quot;) COLUMN(NAME=&quot;shipment.dlv_date&quot;) COLUMN(NAME=&quot;shipment.extra_dlv&quot;) COLUMN(NAME=&quot;shipment.frt_list&quot;) COLUMN(NAME=&quot;shipment.load_type&quot;) COLUMN(NAME=&quot;shipment.curr_code&quot;) COLUMN(NAME=&quot;shipment.exch_rate&quot;) COLUMN(NAME=&quot;shipment.add_chgs&quot;) COLUMN(NAME=&quot;shipment.total_freight&quot;) COLUMN(NAME=&quot;shipment.confirmed&quot;) COLUMN(NAME=&quot;shipment.conf_date&quot;) COLUMN(NAME=&quot;shipment.chg_date&quot;) COLUMN(NAME=&quot;shipment.chg_user&quot;) COLUMN(NAME=&quot;shipment.chg_term&quot;) COLUMN(NAME=&quot;shipment.recall_frt&quot;) COLUMN(NAME=&quot;shipment.pack_size&quot;) COLUMN(NAME=&quot;shipment.driver_name&quot;) COLUMN(NAME=&quot;shipment.licence_no&quot;) COMPUTE(NAME=&quot;&apos; &apos; ~&quot;DESCR~&quot;&quot;) COLUMN(NAME=&quot;shipment.dist_route&quot;) COLUMN(NAME=&quot;shipment.road_permit_no&quot;) COLUMN(NAME=&quot;shipment.gross_weight&quot;) COLUMN(NAME=&quot;shipment.tare_weight&quot;) COLUMN(NAME=&quot;shipment.remarks&quot;) COLUMN(NAME=&quot;shipment.conductor_name&quot;) COLUMN(NAME=&quot;shipment.sale_order&quot;) COLUMN(NAME=&quot;shipment.site_code&quot;) COLUMN(NAME=&quot;shipment.pro_no&quot;) COLUMN(NAME=&quot;shipment.consignee_name&quot;) COLUMN(NAME=&quot;shipment.addr1&quot;) COLUMN(NAME=&quot;shipment.addr2&quot;) COLUMN(NAME=&quot;shipment.addr3&quot;) COLUMN(NAME=&quot;shipment.city&quot;) COLUMN(NAME=&quot;shipment.pin&quot;) COLUMN(NAME=&quot;shipment.no_art&quot;) COLUMN(NAME=&quot;shipment.no_pallet&quot;) COLUMN(NAME=&quot;shipment.state_code&quot;) COLUMN(NAME=&quot;shipment.stan_code&quot;) COLUMN(NAME=&quot;shipment.count_code&quot;) COLUMN(NAME=&quot;shipment.pkg_descr&quot;) COLUMN(NAME=&quot;shipment.unit_value&quot;) COLUMN(NAME=&quot;shipment.item_descr&quot;) COLUMN(NAME=&quot;shipment.tele1&quot;)WHERE(    EXP1 =&quot;( shipment.shipment_date&quot;   OP =&quot;&gt;=&quot;    EXP2 =&quot;:as_datefrom )&quot;    LOGIC =&quot;and&quot; ) WHERE(    EXP1 =&quot;( shipment.shipment_date&quot;   OP =&quot;&lt;=&quot;    EXP2 =&quot;:as_dateto )&quot; ) ) ARG(NAME = &quot;as_datefrom&quot; TYPE = datetime)  ARG(NAME = &quot;as_dateto&quot; TYPE = datetime) </retrieve>
+		<table_column>
+			<type size="20">char</type>
+			<update>yes</update>
+			<updatewhereclause>yes</updatewhereclause>
+			<name>seal_no</name>
+			<dbname>shipment.seal_no</dbname>
+		</table_column>
+		<table_column>
+			<type size="20">char</type>
+			<update>yes</update>
+			<updatewhereclause>yes</updatewhereclause>
+			<name>data_logger_no</name>
+			<dbname>shipment.data_logger_no</dbname>
+		</table_column>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;shipment&quot; ) COLUMN(NAME=&quot;shipment.shipment_id&quot;) COLUMN(NAME=&quot;shipment.shipment_date&quot;) COLUMN(NAME=&quot;shipment.lorry_no&quot;) COLUMN(NAME=&quot;shipment.tran_code&quot;) COLUMN(NAME=&quot;shipment.stan_code__from&quot;) COLUMN(NAME=&quot;shipment.stan_code__to&quot;) COLUMN(NAME=&quot;shipment.freight_amt&quot;) COLUMN(NAME=&quot;shipment.lr_no&quot;) COLUMN(NAME=&quot;shipment.lr_date&quot;) COLUMN(NAME=&quot;shipment.no_of_lr&quot;) COLUMN(NAME=&quot;shipment.bill_no&quot;) COLUMN(NAME=&quot;shipment.bill_date&quot;) COLUMN(NAME=&quot;shipment.call_date&quot;) COLUMN(NAME=&quot;shipment.pick_up_date&quot;) COLUMN(NAME=&quot;shipment.dlv_date&quot;) COLUMN(NAME=&quot;shipment.extra_dlv&quot;) COLUMN(NAME=&quot;shipment.frt_list&quot;) COLUMN(NAME=&quot;shipment.load_type&quot;) COLUMN(NAME=&quot;shipment.curr_code&quot;) COLUMN(NAME=&quot;shipment.exch_rate&quot;) COLUMN(NAME=&quot;shipment.add_chgs&quot;) COLUMN(NAME=&quot;shipment.total_freight&quot;) COLUMN(NAME=&quot;shipment.confirmed&quot;) COLUMN(NAME=&quot;shipment.conf_date&quot;) COLUMN(NAME=&quot;shipment.chg_date&quot;) COLUMN(NAME=&quot;shipment.chg_user&quot;) COLUMN(NAME=&quot;shipment.chg_term&quot;) COLUMN(NAME=&quot;shipment.recall_frt&quot;) COLUMN(NAME=&quot;shipment.pack_size&quot;) COLUMN(NAME=&quot;shipment.driver_name&quot;) COLUMN(NAME=&quot;shipment.licence_no&quot;) COMPUTE(NAME=&quot;&apos; &apos; ~&quot;DESCR~&quot;&quot;) COLUMN(NAME=&quot;shipment.dist_route&quot;) COLUMN(NAME=&quot;shipment.road_permit_no&quot;) COLUMN(NAME=&quot;shipment.gross_weight&quot;) COLUMN(NAME=&quot;shipment.tare_weight&quot;) COLUMN(NAME=&quot;shipment.remarks&quot;) COLUMN(NAME=&quot;shipment.conductor_name&quot;) COLUMN(NAME=&quot;shipment.sale_order&quot;) COLUMN(NAME=&quot;shipment.site_code&quot;) COLUMN(NAME=&quot;shipment.pro_no&quot;) COLUMN(NAME=&quot;shipment.consignee_name&quot;) COLUMN(NAME=&quot;shipment.addr1&quot;) COLUMN(NAME=&quot;shipment.addr2&quot;) COLUMN(NAME=&quot;shipment.addr3&quot;) COLUMN(NAME=&quot;shipment.city&quot;) COLUMN(NAME=&quot;shipment.pin&quot;) COLUMN(NAME=&quot;shipment.no_art&quot;) COLUMN(NAME=&quot;shipment.no_pallet&quot;) COLUMN(NAME=&quot;shipment.state_code&quot;) COLUMN(NAME=&quot;shipment.stan_code&quot;) COLUMN(NAME=&quot;shipment.count_code&quot;) COLUMN(NAME=&quot;shipment.pkg_descr&quot;) COLUMN(NAME=&quot;shipment.unit_value&quot;) COLUMN(NAME=&quot;shipment.item_descr&quot;) COLUMN(NAME=&quot;shipment.tele1&quot;) COLUMN(NAME=&quot;shipment.seal_no&quot;) COLUMN(NAME=&quot;shipment.data_logger_no&quot;)WHERE(    EXP1 =&quot;( shipment.shipment_date&quot;   OP =&quot;&gt;=&quot;    EXP2 =&quot;:as_datefrom )&quot;    LOGIC =&quot;and&quot; ) WHERE(    EXP1 =&quot;( shipment.shipment_date&quot;   OP =&quot;&lt;=&quot;    EXP2 =&quot;:as_dateto )&quot; ) ) ARG(NAME = &quot;as_datefrom&quot; TYPE = datetime)  ARG(NAME = &quot;as_dateto&quot; TYPE = datetime) </retrieve>
 		<update>SHIPMENT</update>
 		<updatewhere>0</updatewhere>
 		<updatekeyinplace>no</updatekeyinplace>
@@ -2001,6 +2015,62 @@
 			<color>67108864</color>
 		</background>
 	</TextObject>
+	<TextObject>
+		<band>Header</band>
+		<alignment>0</alignment>
+		<text>Seal Number</text>
+		<border>6</border>
+		<color>0</color>
+		<x>5696</x>
+		<y>3</y>
+		<height>16</height>
+		<width>159</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>seal_no_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>553648127</color>
+		</background>
+	</TextObject>
+	<TextObject>
+		<band>Header</band>
+		<alignment>0</alignment>
+		<text>Data Logger Number</text>
+		<border>6</border>
+		<color>0</color>
+		<x>5859</x>
+		<y>3</y>
+		<height>16</height>
+		<width>159</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>data_logger_no_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>553648127</color>
+		</background>
+	</TextObject>
 	<ColumnObject>
 		<band>Detail</band>
 		<id>23</id>
@@ -4004,6 +4074,78 @@
 			<color>16777215</color>
 		</background>
 	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>57</id>
+		<alignment>0</alignment>
+		<tabsequence>32766</tabsequence>
+		<border>5</border>
+		<color>0</color>
+		<x>5693</x>
+		<y>2</y>
+		<height>16</height>
+		<width>160</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>seal_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>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>58</id>
+		<alignment>0</alignment>
+		<tabsequence>32766</tabsequence>
+		<border>5</border>
+		<color>0</color>
+		<x>5856</x>
+		<y>2</y>
+		<height>16</height>
+		<width>164</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>data_logger_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>

webitm-wms/module-resource/sql/update.sql

@@ -49819,7 +49819,10 @@ VALUES ('sordform_tr',1,'contract_number',NULL);
 ALTER TABLE SORDFORM ADD REMARKS2 VARCHAR2(100);
 ALTER TABLE SORDFORM ADD REMARKS3 VARCHAR2(100);
 --Ended by Manoj dtd 01/10/2014 to store Ship mark1 and shipmark2 in SOF
-
+--changed by sankara on 06/10/14 for addee new columns in shipment.
+  ALTER TABLE SHIPMENT ADD SEAL_NO VARCHAR2(20);
+  ALTER TABLE SHIPMENT ADD DATA_LOGGER_NO VARCHAR2(20);
+  COMMIT;