| 
...
 | 
...
 | 
@@ -7,7 +7,7 @@ | 
| 
 | 
 | 
     <result column="WAYBILLNOSECONDARY" property="waybillnosecondary" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="SEGMENT" property="segment" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ORIGINATINGSTATIONCN" property="chinesedescription" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ORIGINATINGSTATIONCN" property="originatingstationcn" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="DESTINATIONSTATIONCN" property="destinationstationcn" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" />
 | 
| 
...
 | 
...
 | 
@@ -36,7 +36,9 @@ | 
| 
 | 
 | 
     <result column="STATUS" property="status" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ISBATCH" property="isbatch" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ORIGINATINGSTATION_BILL" property="originatingstationBill" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ORIGINATINGSTATIONBILLCN" property="originatingstationbillcn" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="DESTINATIONSTATION_BILL" property="destinationstationBill" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="DESTINATIONSTATIONBILLCN" property="destinationstationbillcn" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="REPORTORDER" property="reportorder" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="ISLAST" property="islast" jdbcType="VARCHAR" />
 | 
| 
 | 
 | 
     <result column="SHIPPER_CODE" property="shipperCode" jdbcType="VARCHAR" />
 | 
| 
...
 | 
...
 | 
@@ -69,6 +71,10 @@ SELECT | 
| 
 | 
 | 
 			C.CHINESEDESCRIPTION as ORIGINATINGSTATIONCN,
 | 
| 
 | 
 | 
 	T.DESTINATIONSTATION,
 | 
| 
 | 
 | 
 			C1.CHINESEDESCRIPTION AS DESTINATIONSTATIONCN,
 | 
| 
 | 
 | 
     T.ORIGINATINGSTATION_BILL,
 | 
| 
 | 
 | 
 			CB1.CHINESEDESCRIPTION as ORIGINATINGSTATIONBILLCN,
 | 
| 
 | 
 | 
 	T.DESTINATIONSTATION_BILL,
 | 
| 
 | 
 | 
 			CB2.CHINESEDESCRIPTION AS DESTINATIONSTATIONBILLCN,
 | 
| 
 | 
 | 
 	T.SHIPPER_COUNTRYCODE,
 | 
| 
 | 
 | 
 	COUNTRY.COUNTRYDESCCHN,
 | 
| 
 | 
 | 
 	AREA.AREADESCCHN
 | 
| 
...
 | 
...
 | 
@@ -87,6 +93,8 @@ FROM | 
| 
 | 
 | 
 		M.PRODUCTNAME AS PRODUCTNAME,
 | 
| 
 | 
 | 
 		M.ORIGINATINGSTATION AS ORIGINATINGSTATION,
 | 
| 
 | 
 | 
 		M.DESTINATIONSTATION AS DESTINATIONSTATION,
 | 
| 
 | 
 | 
 		M.ORIGINATINGSTATION_BILL AS ORIGINATINGSTATION_BILL,
 | 
| 
 | 
 | 
 		M.DESTINATIONSTATION_BILL AS DESTINATIONSTATION_BILL,
 | 
| 
 | 
 | 
 		M.SHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
 | 
| 
 | 
 | 
 	FROM
 | 
| 
 | 
 | 
 		ORIGINMANIFESTMASTER M UNION
 | 
| 
...
 | 
...
 | 
@@ -103,6 +111,8 @@ FROM | 
| 
 | 
 | 
 		awbh.AWBHPRODUCTNAME AS PRODUCTNAME,
 | 
| 
 | 
 | 
 		awbh.ORIGINATINGSTATION AS ORIGINATINGSTATION,
 | 
| 
 | 
 | 
 		awbh.DESTINATIONSTATION AS DESTINATIONSTATION,
 | 
| 
 | 
 | 
 		awbh.ORIGINATINGSTATION_BILL AS ORIGINATINGSTATION_BILL,
 | 
| 
 | 
 | 
 		awbh.DESTINATIONSTATION_BILL AS DESTINATIONSTATION_BILL,
 | 
| 
 | 
 | 
 		awbh.AWBHSHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
 | 
| 
 | 
 | 
 	FROM
 | 
| 
 | 
 | 
 		V_AWBA_AWBH awbh
 | 
| 
...
 | 
...
 | 
@@ -116,6 +126,14 @@ LEFT JOIN | 
| 
 | 
 | 
 	ON
 | 
| 
 | 
 | 
 		C1.CITYCODE = T.DESTINATIONSTATION
 | 
| 
 | 
 | 
 LEFT JOIN
 | 
| 
 | 
 | 
 	TB_AIRPORTCODE CB1
 | 
| 
 | 
 | 
 ON
 | 
| 
 | 
 | 
 		CB1.CITYCODE = T.ORIGINATINGSTATION_BILL
 | 
| 
 | 
 | 
 LEFT JOIN
 | 
| 
 | 
 | 
 	TB_AIRPORTCODE CB2
 | 
| 
 | 
 | 
 	ON
 | 
| 
 | 
 | 
 		CB2.CITYCODE = T.DESTINATIONSTATION_BILL
 | 
| 
 | 
 | 
 LEFT JOIN
 | 
| 
 | 
 | 
 	T_BAS_COUNTRY COUNTRY
 | 
| 
 | 
 | 
 	ON
 | 
| 
 | 
 | 
 		COUNTRY.COUNTRYID = T.SHIPPER_COUNTRYCODE
 | 
...
 | 
...
 | 
 |