exit_data_analysis / cgonms_provide · 提交

转到一个项目

作者 王勇
提交 5d3ded1d47af128b2415316a202035f22b98a288 1 个父辈 f0a8233b

暂定

内嵌 并排对比
正在显示 15 个修改的文件 包含 225 行增加 和 204 行删除
@@ -58,7 +58,7 @@ public class CgoNmsController { @@ -58,7 +58,7 @@ public class CgoNmsController {
58 58
59 List<ResultExitData> resultList = resultExitDataService.getResultExitDataInfo(resultExitData); 59 List<ResultExitData> resultList = resultExitDataService.getResultExitDataInfo(resultExitData);
60 //取出resultList的长度，不必每次都判断 60 //取出resultList的长度，不必每次都判断
61 - 61 + Date startT=new Date();
62 //遍历获取出所有需要的信息 62 //遍历获取出所有需要的信息
63 for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) { 63 for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) {
64 ResultExitData result = resultList.get(i); 64 ResultExitData result = resultList.get(i);
@@ -82,7 +82,7 @@ public class CgoNmsController { @@ -82,7 +82,7 @@ public class CgoNmsController {
82 * 国家代码 82 * 国家代码
83 */ 83 */
84 TbAirportCode ta = tbAirportCodeService.getTbAirportCodeInfo(ba.getCityId()); 84 TbAirportCode ta = tbAirportCodeService.getTbAirportCodeInfo(ba.getCityId());
85 - // 所属国家 85 + // 所属国家代码
86 result.setCountry(ta.getCountry()); 86 result.setCountry(ta.getCountry());
87 87
88 /** 88 /**
@@ -99,7 +99,6 @@ public class CgoNmsController { @@ -99,7 +99,6 @@ public class CgoNmsController {
99 /** 99 /**
100 * 6.根据 理货信息 中的运单号，获取预配表中的相应数据 100 * 6.根据 理货信息 中的运单号，获取预配表中的相应数据
101 * 101 *
102 - * 承运人二字码  
103 * 发货人名称 102 * 发货人名称
104 * 收货人名称 103 * 收货人名称
105 * 航班目的站 104 * 航班目的站
@@ -115,6 +114,9 @@ public class CgoNmsController { @@ -115,6 +114,9 @@ public class CgoNmsController {
115 //获取目的货物目的站 114 //获取目的货物目的站
116 result.setAimStation(pm.get(0).getDestinationStation()); 115 result.setAimStation(pm.get(0).getDestinationStation());
117 } 116 }
  117 + Date endT=new Date();
  118 + System.out.println(startT);
  119 + System.out.println(endT);
118 return resultList; 120 return resultList;
119 } 121 }
120 } 122 }
@@ -33,20 +33,20 @@ public class BasAirport implements Serializable { @@ -33,20 +33,20 @@ public class BasAirport implements Serializable {
33 * 我也不知道啥意思 33 * 我也不知道啥意思
34 * 机场4代码 34 * 机场4代码
35 */ 35 */
36 - private String airport4Code; 36 +// private String airport4Code;
37 37
38 /** 38 /**
39 * 机场描述，中文 39 * 机场描述，中文
40 */ 40 */
41 - private String airportDescChn; 41 +// private String airportDescChn;
42 42
43 /** 43 /**
44 * 机场描述，英文 44 * 机场描述，英文
45 */ 45 */
46 - private String airportDescEng; 46 +// private String airportDescEng;
47 47
48 /** 48 /**
49 * 操作时间 49 * 操作时间
50 */ 50 */
51 - private Date operationTime; 51 +// private Date operationTime;
52 } 52 }
@@ -34,8 +34,8 @@ public class BasArea implements Serializable { @@ -34,8 +34,8 @@ public class BasArea implements Serializable {
34 */ 34 */
35 private String areaDescChn; 35 private String areaDescChn;
36 36
37 - private String areaDescEng;  
38 -  
39 - private Date operationTime; 37 +// private String areaDescEng;
  38 +//
  39 +// private Date operationTime;
40 40
41 } 41 }
@@ -18,16 +18,6 @@ import lombok.NoArgsConstructor; @@ -18,16 +18,6 @@ import lombok.NoArgsConstructor;
18 public class PrepareMaster implements Serializable { 18 public class PrepareMaster implements Serializable {
19 19
20 private static final long serialVersionUID = 7073373008863847070L; 20 private static final long serialVersionUID = 7073373008863847070L;
21 -  
22 - /**  
23 - * id  
24 - */  
25 - private String autoId;  
26 - /**  
27 - * 承运人二字码  
28 - */  
29 - private String carrier;  
30 -  
31 /** 21 /**
32 * 发货人名称 22 * 发货人名称
33 */ 23 */
@@ -42,97 +32,110 @@ public class PrepareMaster implements Serializable { @@ -42,97 +32,110 @@ public class PrepareMaster implements Serializable {
42 * 运单号 32 * 运单号
43 */ 33 */
44 private String waybillNoMaster; 34 private String waybillNoMaster;
45 -  
46 - /**  
47 - * 航班号  
48 - */  
49 - private String flightNo;  
50 -  
51 - /**  
52 - * 航班日期  
53 - */  
54 - private Date flightDate;  
55 -  
56 /** 35 /**
57 - * 航班起始站  
58 - */  
59 - private String originatingStation;  
60 -  
61 - /**  
62 - * 航班目的站 36 + * 航班目的站，货物目的站
63 */ 37 */
64 private String destinationStation; 38 private String destinationStation;
65 39
66 40
67 -  
68 - private String totalWeight;  
69 -  
70 - private String totalPiece;  
71 -  
72 /** 41 /**
73 - * 预配，理货件数  
74 - */  
75 - private String prepareTotalPiece;  
76 -  
77 - /**  
78 - * 预配，理货重量  
79 - */  
80 - private String prepareTotalWeight;  
81 -  
82 - private Date stowageDate;  
83 -  
84 - private String status;  
85 -  
86 - private String customsStatus;  
87 -  
88 - private String payMode;  
89 -  
90 - private String customsCode;  
91 -  
92 - /**  
93 - * 代理人代码  
94 - */  
95 - private String agentCode;  
96 -  
97 - /**  
98 - * 代理人姓名 42 + * id
99 */ 43 */
100 - private String agentName;  
101 -  
102 - private String shipperCity;  
103 -  
104 - private String shipperAddress;  
105 -  
106 - private String consigneeCity;  
107 -  
108 - private String consigneeAddress;  
109 -  
110 - private String receiptInformation;  
111 -  
112 - private Date createDate;  
113 -  
114 - private String productName;  
115 -  
116 - private String shipperCode;  
117 -  
118 - private String shipperCountrycode;  
119 -  
120 - private String shipperPhone;  
121 -  
122 - private String shipperFax;  
123 -  
124 - private String consigneeCode;  
125 -  
126 - private String consigneeCountrycode;  
127 -  
128 - private String consigneeFax;  
129 -  
130 - private String consigneePhone;  
131 -  
132 - private String shipperAeo;  
133 -  
134 - private String consigneeAeo;  
135 -  
136 - private String unloadingStation; 44 +// private String autoId;
  45 +// /**
  46 +// * 承运人二字码
  47 +// */
  48 +// private String carrier;
  49 +//
  50 +//
  51 +//
  52 +// /**
  53 +// * 航班号
  54 +// */
  55 +// private String flightNo;
  56 +//
  57 +// /**
  58 +// * 航班日期
  59 +// */
  60 +// private Date flightDate;
  61 +//
  62 +// /**
  63 +// * 航班起始站
  64 +// */
  65 +// private String originatingStation;
  66 +//
  67 +//
  68 +//
  69 +//
  70 +//
  71 +// private String totalWeight;
  72 +//
  73 +// private String totalPiece;
  74 +//
  75 +// /**
  76 +// * 预配，理货件数
  77 +// */
  78 +// private String prepareTotalPiece;
  79 +//
  80 +// /**
  81 +// * 预配，理货重量
  82 +// */
  83 +// private String prepareTotalWeight;
  84 +//
  85 +// private Date stowageDate;
  86 +//
  87 +// private String status;
  88 +//
  89 +// private String customsStatus;
  90 +//
  91 +// private String payMode;
  92 +//
  93 +// private String customsCode;
  94 +//
  95 +// /**
  96 +// * 代理人代码
  97 +// */
  98 +// private String agentCode;
  99 +//
  100 +// /**
  101 +// * 代理人姓名
  102 +// */
  103 +// private String agentName;
  104 +//
  105 +// private String shipperCity;
  106 +//
  107 +// private String shipperAddress;
  108 +//
  109 +// private String consigneeCity;
  110 +//
  111 +// private String consigneeAddress;
  112 +//
  113 +// private String receiptInformation;
  114 +//
  115 +// private Date createDate;
  116 +//
  117 +// private String productName;
  118 +//
  119 +// private String shipperCode;
  120 +//
  121 +// private String shipperCountrycode;
  122 +//
  123 +// private String shipperPhone;
  124 +//
  125 +// private String shipperFax;
  126 +//
  127 +// private String consigneeCode;
  128 +//
  129 +// private String consigneeCountrycode;
  130 +//
  131 +// private String consigneeFax;
  132 +//
  133 +// private String consigneePhone;
  134 +//
  135 +// private String shipperAeo;
  136 +//
  137 +// private String consigneeAeo;
  138 +//
  139 +// private String unloadingStation;
137 140
138 } 141 }
@@ -33,20 +33,20 @@ public class TbAirportCode implements Serializable { @@ -33,20 +33,20 @@ public class TbAirportCode implements Serializable {
33 */ 33 */
34 private String country; 34 private String country;
35 35
36 - private String civilCode;  
37 -  
38 - private String chineseDescription;  
39 -  
40 - private String englishDescription;  
41 -  
42 - /**  
43 - * 城市  
44 - */  
45 - private String city;  
46 -  
47 - /**  
48 - * 时区  
49 - */  
50 - private String timeZone; 36 +// private String civilCode;
  37 +//
  38 +// private String chineseDescription;
  39 +//
  40 +// private String englishDescription;
  41 +//
  42 +// /**
  43 +// * 城市
  44 +// */
  45 +// private String city;
  46 +//
  47 +// /**
  48 +// * 时区
  49 +// */
  50 +// private String timeZone;
51 51
52 } 52 }
1 package com.sunyo.wlpt.cgonms.provide.mapper; 1 package com.sunyo.wlpt.cgonms.provide.mapper;
2 2
3 import com.sunyo.wlpt.cgonms.provide.domain.BasAirport; 3 import com.sunyo.wlpt.cgonms.provide.domain.BasAirport;
  4 +import org.apache.ibatis.annotations.Mapper;
4 5
5 /** 6 /**
6 * @author 子诚 7 * @author 子诚
7 * Description： 8 * Description：
8 * 时间：2020/5/20 11:28 9 * 时间：2020/5/20 11:28
9 */ 10 */
  11 +@Mapper
10 public interface BasAirportMapper { 12 public interface BasAirportMapper {
11 /** 13 /**
12 * 获取 新舱单机场代码表 中的相应数据 14 * 获取 新舱单机场代码表 中的相应数据
1 package com.sunyo.wlpt.cgonms.provide.mapper; 1 package com.sunyo.wlpt.cgonms.provide.mapper;
2 2
3 import com.sunyo.wlpt.cgonms.provide.domain.BasArea; 3 import com.sunyo.wlpt.cgonms.provide.domain.BasArea;
  4 +import org.apache.ibatis.annotations.Mapper;
4 5
5 /** 6 /**
6 * @author 子诚 7 * @author 子诚
7 * Description： 8 * Description：
8 * 时间：2020/5/20 11:47 9 * 时间：2020/5/20 11:47
9 */ 10 */
  11 +@Mapper
10 public interface BasAreaMapper { 12 public interface BasAreaMapper {
11 /** 13 /**
12 * 获取 新舱单——区域代码表 的相应数据. 14 * 获取 新舱单——区域代码表 的相应数据.
1 package com.sunyo.wlpt.cgonms.provide.mapper; 1 package com.sunyo.wlpt.cgonms.provide.mapper;
2 2
3 import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster; 3 import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
  4 +import org.apache.ibatis.annotations.Mapper;
4 5
5 import java.util.List; 6 import java.util.List;
6 7
@@ -9,6 +10,7 @@ import java.util.List; @@ -9,6 +10,7 @@ import java.util.List;
9 * Description： 10 * Description：
10 * 时间：2020/5/20 11:12 11 * 时间：2020/5/20 11:12
11 */ 12 */
  13 +@Mapper
12 public interface PrepareMasterMapper { 14 public interface PrepareMasterMapper {
13 /** 15 /**
14 * 获取预配表中的相应数据. 16 * 获取预配表中的相应数据.
1 package com.sunyo.wlpt.cgonms.provide.mapper; 1 package com.sunyo.wlpt.cgonms.provide.mapper;
2 2
3 import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData; 3 import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
  4 +import org.apache.ibatis.annotations.Mapper;
4 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
5 6
6 import java.util.Date; 7 import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.List; @@ -11,6 +12,7 @@ import java.util.List;
11 * Description： 12 * Description：
12 * 时间：2020/5/20 10:40 13 * 时间：2020/5/20 10:40
13 */ 14 */
  15 +@Mapper
14 public interface ResultExitDataMapper { 16 public interface ResultExitDataMapper {
15 /** 17 /**
16 * 获取 新舱单——理货信息 中的相应数据. 18 * 获取 新舱单——理货信息 中的相应数据.
1 package com.sunyo.wlpt.cgonms.provide.mapper; 1 package com.sunyo.wlpt.cgonms.provide.mapper;
2 2
3 import com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode; 3 import com.sunyo.wlpt.cgonms.provide.domain.TbAirportCode;
  4 +import org.apache.ibatis.annotations.Mapper;
4 5
5 /** 6 /**
6 * @author 子诚 7 * @author 子诚
7 * Description： 8 * Description：
8 * 时间：2020/5/20 11:41 9 * 时间：2020/5/20 11:41
9 */ 10 */
  11 +@Mapper
10 public interface TbAirportCodeMapper { 12 public interface TbAirportCodeMapper {
11 /** 13 /**
12 * 获取 天博——机场代码表 的相应数据. 14 * 获取 天博——机场代码表 的相应数据.
@@ -5,15 +5,16 @@ @@ -5,15 +5,16 @@
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <!--@Table T_BAS_AIRPORT--> 6 <!--@Table T_BAS_AIRPORT-->
7 <result column="AIRPORTID" jdbcType="VARCHAR" property="airportId"/> 7 <result column="AIRPORTID" jdbcType="VARCHAR" property="airportId"/>
8 - <result column="AIRPORT4CODE" jdbcType="CHAR" property="airport4Code"/>  
9 <result column="CITYID" jdbcType="VARCHAR" property="cityId"/> 8 <result column="CITYID" jdbcType="VARCHAR" property="cityId"/>
10 - <result column="AIRPORTDESCCHN" jdbcType="VARCHAR" property="airportDescChn"/>  
11 - <result column="AIRPORTDESCENG" jdbcType="VARCHAR" property="airportDescEng"/>  
12 - <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/> 9 +<!-- <result column="AIRPORT4CODE" jdbcType="CHAR" property="airport4Code"/>-->
  10 +<!-- <result column="AIRPORTDESCCHN" jdbcType="VARCHAR" property="airportDescChn"/>-->
  11 +<!-- <result column="AIRPORTDESCENG" jdbcType="VARCHAR" property="airportDescEng"/>-->
  12 +<!-- <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/>-->
13 </resultMap> 13 </resultMap>
14 <sql id="Base_Column_List"> 14 <sql id="Base_Column_List">
15 <!--@mbg.generated--> 15 <!--@mbg.generated-->
16 - AIRPORTID, AIRPORT4CODE, CITYID, AIRPORTDESCCHN, AIRPORTDESCENG, OPERATIONTIME 16 + AIRPORTID, CITYID
  17 +<!-- ,AIRPORT4CODE, AIRPORTDESCCHN, AIRPORTDESCENG, OPERATIONTIME-->
17 </sql> 18 </sql>
18 <select id="getBasAirportInfo" parameterType="java.lang.String" resultMap="BaseResultMap"> 19 <select id="getBasAirportInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
19 select 20 select
@@ -7,12 +7,13 @@ @@ -7,12 +7,13 @@
7 <result column="AREAID" jdbcType="VARCHAR" property="areaId"/> 7 <result column="AREAID" jdbcType="VARCHAR" property="areaId"/>
8 <result column="NETID" jdbcType="VARCHAR" property="netId"/> 8 <result column="NETID" jdbcType="VARCHAR" property="netId"/>
9 <result column="AREADESCCHN" jdbcType="VARCHAR" property="areaDescChn"/> 9 <result column="AREADESCCHN" jdbcType="VARCHAR" property="areaDescChn"/>
10 - <result column="AREADESCENG" jdbcType="VARCHAR" property="areaDescEng"/>  
11 - <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/> 10 +<!-- <result column="AREADESCENG" jdbcType="VARCHAR" property="areaDescEng"/>-->
  11 +<!-- <result column="OPERATIONTIME" jdbcType="TIMESTAMP" property="operationTime"/>-->
12 </resultMap> 12 </resultMap>
13 <sql id="Base_Column_List"> 13 <sql id="Base_Column_List">
14 <!--@mbg.generated--> 14 <!--@mbg.generated-->
15 - AREAID, NETID, AREADESCCHN, AREADESCENG, OPERATIONTIME 15 + AREAID, NETID, AREADESCCHN
  16 +<!-- , AREADESCENG, OPERATIONTIME-->
16 </sql> 17 </sql>
17 <select id="getBasAreaInfo" parameterType="java.lang.String" resultMap="BaseResultMap"> 18 <select id="getBasAreaInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
18 select 19 select
@@ -4,54 +4,55 @@ @@ -4,54 +4,55 @@
4 <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster"> 4 <resultMap id="BaseResultMap" type="com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <!--@Table PREPAREMASTER--> 6 <!--@Table PREPAREMASTER-->
7 - <result column="AUTOID" jdbcType="VARCHAR" property="autoId"/>  
8 - <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightNo"/>  
9 - <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightDate"/>  
10 - <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingStation"/> 7 + <result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneeName"/>
  8 + <result column="SHIPPERNAME" jdbcType="VARCHAR" property="shipperName"/>
11 <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationStation"/> 9 <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationStation"/>
12 <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillNoMaster"/> 10 <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillNoMaster"/>
13 - <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>  
14 - <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>  
15 - <result column="PREPARETOTALPIECE" jdbcType="VARCHAR" property="prepareTotalPiece"/>  
16 - <result column="PREPARETOTALWEIGHT" jdbcType="VARCHAR" property="prepareTotalWeight"/>  
17 - <result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowageDate"/>  
18 - <result column="STATUS" jdbcType="VARCHAR" property="status"/>  
19 - <result column="CARRIER" jdbcType="VARCHAR" property="carrier"/>  
20 - <result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsStatus"/>  
21 - <result column="PAYMODE" jdbcType="VARCHAR" property="payMode"/>  
22 - <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>  
23 - <result column="AGENTCODE" jdbcType="VARCHAR" property="agentCode"/>  
24 - <result column="AGENTNAME" jdbcType="VARCHAR" property="agentName"/>  
25 - <result column="SHIPPERNAME" jdbcType="VARCHAR" property="shipperName"/>  
26 - <result column="SHIPPERCITY" jdbcType="VARCHAR" property="shipperCity"/>  
27 - <result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperAddress"/>  
28 - <result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneeName"/>  
29 - <result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneeCity"/>  
30 - <result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeAddress"/>  
31 - <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>  
32 - <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>  
33 - <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>  
34 - <result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode"/>  
35 - <result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode"/>  
36 - <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone"/>  
37 - <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax"/>  
38 - <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode"/>  
39 - <result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode"/>  
40 - <result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax"/>  
41 - <result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone"/>  
42 - <result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo"/>  
43 - <result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo"/>  
44 - <result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingStation"/> 11 +<!-- <result column="AUTOID" jdbcType="VARCHAR" property="autoId"/>-->
  12 +<!-- <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightNo"/>-->
  13 +<!-- <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightDate"/>-->
  14 +<!-- <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingStation"/>-->
  15 +<!-- <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>-->
  16 +<!-- <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>-->
  17 +<!-- <result column="PREPARETOTALPIECE" jdbcType="VARCHAR" property="prepareTotalPiece"/>-->
  18 +<!-- <result column="PREPARETOTALWEIGHT" jdbcType="VARCHAR" property="prepareTotalWeight"/>-->
  19 +<!-- <result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowageDate"/>-->
  20 +<!-- <result column="STATUS" jdbcType="VARCHAR" property="status"/>-->
  21 +<!-- <result column="CARRIER" jdbcType="VARCHAR" property="carrier"/>-->
  22 +<!-- <result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsStatus"/>-->
  23 +<!-- <result column="PAYMODE" jdbcType="VARCHAR" property="payMode"/>-->
  24 +<!-- <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>-->
  25 +<!-- <result column="AGENTCODE" jdbcType="VARCHAR" property="agentCode"/>-->
  26 +<!-- <result column="AGENTNAME" jdbcType="VARCHAR" property="agentName"/>-->
  27 +<!-- <result column="SHIPPERCITY" jdbcType="VARCHAR" property="shipperCity"/>-->
  28 +<!-- <result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperAddress"/>-->
  29 +<!-- <result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneeCity"/>-->
  30 +<!-- <result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeAddress"/>-->
  31 +<!-- <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>-->
  32 +<!-- <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>-->
  33 +<!-- <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>-->
  34 +<!-- <result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode"/>-->
  35 +<!-- <result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode"/>-->
  36 +<!-- <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone"/>-->
  37 +<!-- <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax"/>-->
  38 +<!-- <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode"/>-->
  39 +<!-- <result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode"/>-->
  40 +<!-- <result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax"/>-->
  41 +<!-- <result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone"/>-->
  42 +<!-- <result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo"/>-->
  43 +<!-- <result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo"/>-->
  44 +<!-- <result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingStation"/>-->
45 </resultMap> 45 </resultMap>
46 <sql id="Base_Column_List"> 46 <sql id="Base_Column_List">
47 <!--@mbg.generated--> 47 <!--@mbg.generated-->
48 - AUTOID, FLIGHTNO, FLIGHTDATE, ORIGINATINGSTATION, DESTINATIONSTATION, WAYBILLNOMASTER,  
49 - TOTALWEIGHT, TOTALPIECE, PREPARETOTALPIECE, PREPARETOTALWEIGHT, STOWAGEDATE, "STATUS",  
50 - CARRIER, CUSTOMSSTATUS, PAYMODE, CUSTOMSCODE, AGENTCODE, AGENTNAME, SHIPPERNAME,  
51 - SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION,  
52 - CREATEDATE, PRODUCTNAME, SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX,  
53 - CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX, CONSIGNEE_PHONE, SHIPPER_AEO,  
54 - CONSIGNEE_AEO, UNLOADINGSTATION 48 + CONSIGNEENAME,SHIPPERNAME,DESTINATIONSTATION,WAYBILLNOMASTER
  49 +<!-- AUTOID, FLIGHTNO, FLIGHTDATE, ORIGINATINGSTATION, -->
  50 +<!-- TOTALWEIGHT, TOTALPIECE, PREPARETOTALPIECE, PREPARETOTALWEIGHT, STOWAGEDATE, "STATUS",-->
  51 +<!-- CARRIER, CUSTOMSSTATUS, PAYMODE, CUSTOMSCODE, AGENTCODE, AGENTNAME, -->
  52 +<!-- SHIPPERCITY, SHIPPERADDRESS, CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION,-->
  53 +<!-- CREATEDATE, PRODUCTNAME, SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, SHIPPER_FAX,-->
  54 +<!-- CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, CONSIGNEE_FAX, CONSIGNEE_PHONE, SHIPPER_AEO,-->
  55 +<!-- CONSIGNEE_AEO, UNLOADINGSTATION-->
55 </sql> 56 </sql>
56 <select id="getPrepareMasterInfo" parameterType="java.lang.String" resultMap="BaseResultMap"> 57 <select id="getPrepareMasterInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
57 select 58 select
@@ -14,36 +14,38 @@ @@ -14,36 +14,38 @@
14 <result column="TALLYTOTALPIECE" jdbcType="VARCHAR" property="tallyTotalPiece"/> 14 <result column="TALLYTOTALPIECE" jdbcType="VARCHAR" property="tallyTotalPiece"/>
15 <result column="TALLYTOTALWEIGHT" jdbcType="VARCHAR" property="tallyTotalWeight"/> 15 <result column="TALLYTOTALWEIGHT" jdbcType="VARCHAR" property="tallyTotalWeight"/>
16 16
17 -<!-- <result column="O_NAME" jdbcType="VARCHAR" property="oName"/>-->  
18 -<!-- <result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName"/>-->  
19 -<!-- <result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypeCode"/>-->  
20 -<!-- <result column="TALLTYPE" jdbcType="VARCHAR" property="tallType"/>-->  
21 -<!-- <result column="FD_NAME" jdbcType="VARCHAR" property="fdName"/>-->  
22 -<!-- <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>-->  
23 -<!-- <result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalGrossWeightMeasureuc"/>-->  
24 -<!-- <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>-->  
25 -<!-- <result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossWeightMeasureuc"/>-->  
26 -<!-- <result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadStartTime"/>-->  
27 -<!-- <result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadEndTime"/>-->  
28 -<!-- <result column="STATUS" jdbcType="VARCHAR" property="status"/>-->  
29 -<!-- <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>-->  
30 -<!-- <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>-->  
31 -<!-- <result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargeDate"/>-->  
32 -<!-- <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>-->  
33 -<!-- <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>-->  
34 -<!-- <result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag"/>-->  
35 -<!-- <result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag"/>-->  
36 -<!-- <result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime"/>-->  
37 -<!-- <result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportSplitDescription"/>--> 17 + <!-- <result column="O_NAME" jdbcType="VARCHAR" property="oName"/>-->
  18 + <!-- <result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName"/>-->
  19 + <!-- <result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypeCode"/>-->
  20 + <!-- <result column="TALLTYPE" jdbcType="VARCHAR" property="tallType"/>-->
  21 + <!-- <result column="FD_NAME" jdbcType="VARCHAR" property="fdName"/>-->
  22 + <!-- <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>-->
  23 + <!-- <result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalGrossWeightMeasureuc"/>-->
  24 + <!-- <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>-->
  25 + <!-- <result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossWeightMeasureuc"/>-->
  26 + <!-- <result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadStartTime"/>-->
  27 + <!-- <result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadEndTime"/>-->
  28 + <!-- <result column="STATUS" jdbcType="VARCHAR" property="status"/>-->
  29 + <!-- <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>-->
  30 + <!-- <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>-->
  31 + <!-- <result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargeDate"/>-->
  32 + <!-- <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>-->
  33 + <!-- <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>-->
  34 + <!-- <result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag"/>-->
  35 + <!-- <result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag"/>-->
  36 + <!-- <result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime"/>-->
  37 + <!-- <result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportSplitDescription"/>-->
38 38
39 </resultMap> 39 </resultMap>
40 <sql id="Base_Column_List"> 40 <sql id="Base_Column_List">
41 <!--@mbg.generated--> 41 <!--@mbg.generated-->
42 - AUTOID, WAYBILLNOMASTER, TCD_NAME, TCD_TYPECODE, TALLTYPE, FLIGHTNO, FLIGHTDATE,  
43 - SEGMENT, ORIGINATINGSTATION, O_NAME, DESTINATIONSTATION, FD_NAME, TOTALWEIGHT, TOTALGROSSWEIGHTMEASUREUC,  
44 - TOTALPIECE, TALLYTOTALPIECE, TALLYTOTALWEIGHT, GROSSWEIGHTMEASUREUC, LOADSTARTTIME,  
45 - LOADENDTIME, "STATUS", CUSTOMSCODE, PRODUCTNAME, DISCHARGEDATE, RECEIPTINFORMATION,  
46 - CREATEDATE, DEAL_FLAG, BILL_TALLY_FLAG, DEAL_TIME, TRANSPORTSPLITDESCRIPTION 42 + AUTOID, WAYBILLNOMASTER, SEGMENT,FLIGHTNO, FLIGHTDATE,TALLYTOTALPIECE, TALLYTOTALWEIGHT,
  43 + ORIGINATINGSTATION,DESTINATIONSTATION
  44 +<!-- TCD_NAME, TCD_TYPECODE, TALLTYPE,-->
  45 +<!-- O_NAME, FD_NAME, TOTALWEIGHT, TOTALGROSSWEIGHTMEASUREUC,-->
  46 +<!-- TOTALPIECE, GROSSWEIGHTMEASUREUC, LOADSTARTTIME,-->
  47 +<!-- LOADENDTIME, "STATUS", CUSTOMSCODE, PRODUCTNAME, DISCHARGEDATE, RECEIPTINFORMATION,-->
  48 +<!-- CREATEDATE, DEAL_FLAG, BILL_TALLY_FLAG, DEAL_TIME, TRANSPORTSPLITDESCRIPTION-->
47 </sql> 49 </sql>
48 <!-- 获取 新舱单——理货信息 中的相应数据 --> 50 <!-- 获取 新舱单——理货信息 中的相应数据 -->
49 <select id="getResultExitDataInfo" parameterType="com.sunyo.wlpt.cgonms.provide.domain.ResultExitData" 51 <select id="getResultExitDataInfo" parameterType="com.sunyo.wlpt.cgonms.provide.domain.ResultExitData"
@@ -5,18 +5,19 @@ @@ -5,18 +5,19 @@
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <!--@Table TB_AIRPORTCODE--> 6 <!--@Table TB_AIRPORTCODE-->
7 <result column="CITYCODE" jdbcType="VARCHAR" property="cityCode"/> 7 <result column="CITYCODE" jdbcType="VARCHAR" property="cityCode"/>
8 - <result column="CIVILCODE" jdbcType="VARCHAR" property="civilCode"/>  
9 - <result column="CHINESEDESCRIPTION" jdbcType="VARCHAR" property="chineseDescription"/>  
10 - <result column="ENGLISHDESCRIPTION" jdbcType="VARCHAR" property="englishDescription"/>  
11 <result column="AREA" jdbcType="VARCHAR" property="area"/> 8 <result column="AREA" jdbcType="VARCHAR" property="area"/>
12 <result column="COUNTRY" jdbcType="VARCHAR" property="country"/> 9 <result column="COUNTRY" jdbcType="VARCHAR" property="country"/>
13 - <result column="CITY" jdbcType="VARCHAR" property="city"/>  
14 - <result column="TIMEZONE" jdbcType="VARCHAR" property="timeZone"/> 10 +
  11 +<!-- <result column="CIVILCODE" jdbcType="VARCHAR" property="civilCode"/>-->
  12 +<!-- <result column="CHINESEDESCRIPTION" jdbcType="VARCHAR" property="chineseDescription"/>-->
  13 +<!-- <result column="ENGLISHDESCRIPTION" jdbcType="VARCHAR" property="englishDescription"/>-->
  14 +<!-- <result column="CITY" jdbcType="VARCHAR" property="city"/>-->
  15 +<!-- <result column="TIMEZONE" jdbcType="VARCHAR" property="timeZone"/>-->
15 </resultMap> 16 </resultMap>
16 <sql id="Base_Column_List"> 17 <sql id="Base_Column_List">
17 <!--@mbg.generated--> 18 <!--@mbg.generated-->
18 - CITYCODE, CIVILCODE, CHINESEDESCRIPTION, ENGLISHDESCRIPTION, AREA, COUNTRY, CITY,  
19 - TIMEZONE 19 + CITYCODE, AREA, COUNTRY
  20 +<!-- CIVILCODE, CHINESEDESCRIPTION, ENGLISHDESCRIPTION, COUNTRY, CITY,TIMEZONE-->
20 </sql> 21 </sql>
21 <select id="getTbAirportCodeInfo" parameterType="java.lang.String" resultMap="BaseResultMap"> 22 <select id="getTbAirportCodeInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
22 select 23 select