wlxxpt / customAnalysis · 提交

转到一个项目

作者 朱兆平
提交 7e50bb353bc23ed81d6a107b068bb962a7323cd1 1 个父辈 c239d025

更改配置信息

内嵌 并排对比
正在显示 4 个修改的文件 包含 45 行增加 和 333 行删除
@@ -22,7 +22,7 @@ spring: @@ -22,7 +22,7 @@ spring:
22 static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,classpath:/public/,file:${web.upload-path} 22 static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,classpath:/public/,file:${web.upload-path}
23 23
24 application: 24 application:
25 - name: customAnalysisReception 25 + name: WLTP-NMMS-CUSTOM-RECIPTION-RESOLVER
26 26
27 jackson: 27 jackson:
28 serialization: 28 serialization:
@@ -49,7 +49,7 @@ spring: @@ -49,7 +49,7 @@ spring:
49 type: com.alibaba.druid.pool.DruidDataSource 49 type: com.alibaba.druid.pool.DruidDataSource
50 #oracle 50 #oracle
51 driver-class-name: oracle.jdbc.OracleDriver 51 driver-class-name: oracle.jdbc.OracleDriver
52 - url: jdbc:oracle:thin:@10.50.3.69:1521:CGODB 52 + url: jdbc:oracle:thin:@218.28.199.134:8004banner.txt:CGODB
53 username: CGONMS 53 username: CGONMS
54 password: 1q2w3e4r 54 password: 1q2w3e4r
55 #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码 55 #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
@@ -135,6 +135,7 @@ custom: @@ -135,6 +135,7 @@ custom:
135 receptDirectory: /Users/mrz/Downloads/rdp_temp 135 receptDirectory: /Users/mrz/Downloads/rdp_temp
136 #回执解析成功后的备份目录 136 #回执解析成功后的备份目录
137 receptBakDir: ./success 137 receptBakDir: ./success
  138 + #解析错误报文的备份目录
138 errBakDir: ./error 139 errBakDir: ./error
139 devops: 140 devops:
140 dir: 141 dir:
  1 +${AnsiColor.YELLOW}
  2 + ##################*CETC-TIANBO*#########################
  3 +
  4 + .::::.
  5 + .::::::::.
  6 + :::::::::::
  7 + ..:::::::::::'
  8 + '::::::::::::'
  9 + .::::::::::
  10 + '::::::::::::::..
  11 + ..::::::::::::.
  12 + ``::::::::::::::::
  13 + ::::``:::::::::' .:::.
  14 + ::::' ':::::' .::::::::.
  15 + .::::' :::: .:::::::'::::.
  16 + .:::' ::::: .:::::::::' ':::::.
  17 + .::' :::::.:::::::::' ':::::.
  18 + .::' ::::::::::::::' ``::::.
  19 + ...::: ::::::::::::' ``::.
  20 + ```` ':. ':::::::::' ::::..
  21 + '.:::::' ':'````..
  22 + #########################################################
  23 +
  24 +
  25 +
  26 +
  27 +==================================================
  28 +Application Info：${application.title}
  29 +ver:${application.version}
  30 +Powered by：Spring Boot ${spring-boot.version}
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd"> 4 "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
5 <generatorConfiguration> 5 <generatorConfiguration>
6 <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包--> 6 <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
7 - <!--<classPathEntry location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>-->  
8 - <classPathEntry location="/Users/mrz/Documents/maven/ojdbc6.jar"/> 7 + <classPathEntry location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
  8 + <!--<classPathEntry location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
9 <context id="DB2Tables" targetRuntime="MyBatis3"> 9 <context id="DB2Tables" targetRuntime="MyBatis3">
10 <commentGenerator> 10 <commentGenerator>
11 <property name="suppressDate" value="true"/> 11 <property name="suppressDate" value="true"/>
@@ -13,16 +13,16 @@ @@ -13,16 +13,16 @@
13 <property name="suppressAllComments" value="true"/> 13 <property name="suppressAllComments" value="true"/>
14 </commentGenerator> 14 </commentGenerator>
15 <!--数据库链接URL，用户名、密码 --> 15 <!--数据库链接URL，用户名、密码 -->
16 - <!--<jdbcConnection driverClass="com.mysql.jdbc.Driver"-->  
17 - <!--connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"-->  
18 - <!--userId="root"-->  
19 - <!--password="">-->  
20 - <!--</jdbcConnection>-->  
21 - <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"  
22 - connectionURL="jdbc:oracle:thin:@218.28.199.134:8004:CGODB"  
23 - userId="CGONMS"  
24 - password="1q2w3e4r"> 16 + <jdbcConnection driverClass="com.mysql.jdbc.Driver"
  17 + connectionURL="jdbc:mysql://118.31.66.166:3306/WLPT_NMMS"
  18 + userId="110"
  19 + password="QAHqCJf2kFYCLirM">
25 </jdbcConnection> 20 </jdbcConnection>
  21 + <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
  22 + <!--connectionURL="jdbc:oracle:thin:@218.28.199.134:8004:CGODB"-->
  23 + <!--userId="CGONMS"-->
  24 + <!--password="1q2w3e4r">-->
  25 + <!--</jdbcConnection>-->
26 <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和 26 <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和
27 NUMERIC 类型解析为java.math.BigDecimal --> 27 NUMERIC 类型解析为java.math.BigDecimal -->
28 <!--<javaTypeResolver>--> 28 <!--<javaTypeResolver>-->
@@ -45,6 +45,6 @@ @@ -45,6 +45,6 @@
45 <property name="enableSubPackages" value="true"/> 45 <property name="enableSubPackages" value="true"/>
46 </javaClientGenerator> 46 </javaClientGenerator>
47 <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名--> 47 <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
48 - <table tableName="originmanifestsecondary" domainObjectName="originmanifestsecondary" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table> 48 + <table tableName="CUSTOM_RESPONSE" domainObjectName="CUSTOM_RESPONSE" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
49 </context> 49 </context>
50 </generatorConfiguration> 50 </generatorConfiguration>
@@ -964,325 +964,6 @@ @@ -964,325 +964,6 @@
964 UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR} 964 UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR}
965 where ID = #{id,jdbcType=DECIMAL} 965 where ID = #{id,jdbcType=DECIMAL}
966 </update> 966 </update>
967 - <!--<resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">-->  
968 - <!--<result column="AUTOID" jdbcType="VARCHAR" property="autoid" />-->  
969 - <!--<result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />-->  
970 - <!--<result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />-->  
971 - <!--<result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />-->  
972 - <!--<result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />-->  
973 - <!--<result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />-->  
974 - <!--<result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />-->  
975 - <!--<result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />-->  
976 - <!--<result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />-->  
977 - <!--<result column="CARRIER" jdbcType="VARCHAR" property="carrier" />-->  
978 - <!--<result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />-->  
979 - <!--<result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />-->  
980 - <!--<result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />-->  
981 - <!--<result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />-->  
982 - <!--<result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />-->  
983 - <!--<result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />-->  
984 - <!--<result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />-->  
985 - <!--<result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />-->  
986 - <!--<result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />-->  
987 - <!--<result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />-->  
988 - <!--<result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />-->  
989 - <!--<result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />-->  
990 - <!--<result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />-->  
991 - <!--<result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />-->  
992 - <!--<result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />-->  
993 - <!--<result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />-->  
994 - <!--<result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />-->  
995 - <!--<result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />-->  
996 - <!--<result column="STATUS" jdbcType="VARCHAR" property="status" />-->  
997 - <!--<result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />-->  
998 - <!--<result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />-->  
999 - <!--<result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />-->  
1000 - <!--<result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />-->  
1001 - <!--<result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />-->  
1002 - <!--<result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />-->  
1003 - <!--<result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />-->  
1004 - <!--<result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />-->  
1005 - <!--<result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />-->  
1006 - <!--<result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />-->  
1007 - <!--<result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />-->  
1008 - <!--</resultMap>-->  
1009 - <!--<insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->  
1010 - <!--insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY, -->  
1011 - <!--TOTALWEIGHT, TOTALPIECE, PREPAREPIECE, -->  
1012 - <!--PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID, -->  
1013 - <!--CARRIER, FLIGHTNO, FLIGHTDATE, -->  
1014 - <!--ORIGINATINGSTATION, DESTINATIONSTATION, -->  
1015 - <!--CUSTOMSSTATUS, PAYMODE, PRODUCTNAME, -->  
1016 - <!--STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME, -->  
1017 - <!--SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, -->  
1018 - <!--CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION, -->  
1019 - <!--AGENTCODE, AGENTNAME, STATUS, -->  
1020 - <!--SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, -->  
1021 - <!--SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, -->  
1022 - <!--CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO, -->  
1023 - <!--CONSIGNEE_AEO, UNLOADINGSTATION)-->  
1024 - <!--values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR}, -->  
1025 - <!--#{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR}, -->  
1026 - <!--#{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR}, -->  
1027 - <!--#{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP}, -->  
1028 - <!--#{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, -->  
1029 - <!--#{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, -->  
1030 - <!--#{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, -->  
1031 - <!--#{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR}, -->  
1032 - <!--#{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, -->  
1033 - <!--#{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, -->  
1034 - <!--#{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, -->  
1035 - <!--#{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, -->  
1036 - <!--#{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR}, -->  
1037 - <!--#{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})-->  
1038 - <!--</insert>-->  
1039 - <!--<insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->  
1040 - <!--insert into PREPARESECONDARY-->  
1041 - <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->  
1042 - <!--<if test="autoid != null">-->  
1043 - <!--AUTOID,-->  
1044 - <!--</if>-->  
1045 - <!--<if test="waybillnomaster != null">-->  
1046 - <!--WAYBILLNOMASTER,-->  
1047 - <!--</if>-->  
1048 - <!--<if test="waybillnosecondary != null">-->  
1049 - <!--WAYBILLNOSECONDARY,-->  
1050 - <!--</if>-->  
1051 - <!--<if test="totalweight != null">-->  
1052 - <!--TOTALWEIGHT,-->  
1053 - <!--</if>-->  
1054 - <!--<if test="totalpiece != null">-->  
1055 - <!--TOTALPIECE,-->  
1056 - <!--</if>-->  
1057 - <!--<if test="preparepiece != null">-->  
1058 - <!--PREPAREPIECE,-->  
1059 - <!--</if>-->  
1060 - <!--<if test="prepareweight != null">-->  
1061 - <!--PREPAREWEIGHT,-->  
1062 - <!--</if>-->  
1063 - <!--<if test="createdate != null">-->  
1064 - <!--CREATEDATE,-->  
1065 - <!--</if>-->  
1066 - <!--<if test="preparemasterid != null">-->  
1067 - <!--PREPAREMASTERID,-->  
1068 - <!--</if>-->  
1069 - <!--<if test="carrier != null">-->  
1070 - <!--CARRIER,-->  
1071 - <!--</if>-->  
1072 - <!--<if test="flightno != null">-->  
1073 - <!--FLIGHTNO,-->  
1074 - <!--</if>-->  
1075 - <!--<if test="flightdate != null">-->  
1076 - <!--FLIGHTDATE,-->  
1077 - <!--</if>-->  
1078 - <!--<if test="originatingstation != null">-->  
1079 - <!--ORIGINATINGSTATION,-->  
1080 - <!--</if>-->  
1081 - <!--<if test="destinationstation != null">-->  
1082 - <!--DESTINATIONSTATION,-->  
1083 - <!--</if>-->  
1084 - <!--<if test="customsstatus != null">-->  
1085 - <!--CUSTOMSSTATUS,-->  
1086 - <!--</if>-->  
1087 - <!--<if test="paymode != null">-->  
1088 - <!--PAYMODE,-->  
1089 - <!--</if>-->  
1090 - <!--<if test="productname != null">-->  
1091 - <!--PRODUCTNAME,-->  
1092 - <!--</if>-->  
1093 - <!--<if test="stowagedate != null">-->  
1094 - <!--STOWAGEDATE,-->  
1095 - <!--</if>-->  
1096 - <!--<if test="customscode != null">-->  
1097 - <!--CUSTOMSCODE,-->  
1098 - <!--</if>-->  
1099 - <!--<if test="shippername != null">-->  
1100 - <!--SHIPPERNAME,-->  
1101 - <!--</if>-->  
1102 - <!--<if test="shippercity != null">-->  
1103 - <!--SHIPPERCITY,-->  
1104 - <!--</if>-->  
1105 - <!--<if test="shipperaddress != null">-->  
1106 - <!--SHIPPERADDRESS,-->  
1107 - <!--</if>-->  
1108 - <!--<if test="consigneename != null">-->  
1109 - <!--CONSIGNEENAME,-->  
1110 - <!--</if>-->  
1111 - <!--<if test="consigneecity != null">-->  
1112 - <!--CONSIGNEECITY,-->  
1113 - <!--</if>-->  
1114 - <!--<if test="consigneeaddress != null">-->  
1115 - <!--CONSIGNEEADDRESS,-->  
1116 - <!--</if>-->  
1117 - <!--<if test="receiptinformation != null">-->  
1118 - <!--RECEIPTINFORMATION,-->  
1119 - <!--</if>-->  
1120 - <!--<if test="agentcode != null">-->  
1121 - <!--AGENTCODE,-->  
1122 - <!--</if>-->  
1123 - <!--<if test="agentname != null">-->  
1124 - <!--AGENTNAME,-->  
1125 - <!--</if>-->  
1126 - <!--<if test="status != null">-->  
1127 - <!--STATUS,-->  
1128 - <!--</if>-->  
1129 - <!--<if test="shipperCode != null">-->  
1130 - <!--SHIPPER_CODE,-->  
1131 - <!--</if>-->  
1132 - <!--<if test="shipperCountrycode != null">-->  
1133 - <!--SHIPPER_COUNTRYCODE,-->  
1134 - <!--</if>-->  
1135 - <!--<if test="shipperPhone != null">-->  
1136 - <!--SHIPPER_PHONE,-->  
1137 - <!--</if>-->  
1138 - <!--<if test="shipperFax != null">-->  
1139 - <!--SHIPPER_FAX,-->  
1140 - <!--</if>-->  
1141 - <!--<if test="consigneeCode != null">-->  
1142 - <!--CONSIGNEE_CODE,-->  
1143 - <!--</if>-->  
1144 - <!--<if test="consigneeCountrycode != null">-->  
1145 - <!--CONSIGNEE_COUNTRYCODE,-->  
1146 - <!--</if>-->  
1147 - <!--<if test="consigneePhone != null">-->  
1148 - <!--CONSIGNEE_PHONE,-->  
1149 - <!--</if>-->  
1150 - <!--<if test="consigneeFax != null">-->  
1151 - <!--CONSIGNEE_FAX,-->  
1152 - <!--</if>-->  
1153 - <!--<if test="shipperAeo != null">-->  
1154 - <!--SHIPPER_AEO,-->  
1155 - <!--</if>-->  
1156 - <!--<if test="consigneeAeo != null">-->  
1157 - <!--CONSIGNEE_AEO,-->  
1158 - <!--</if>-->  
1159 - <!--<if test="unloadingstation != null">-->  
1160 - <!--UNLOADINGSTATION,-->  
1161 - <!--</if>-->  
1162 - <!--</trim>-->  
1163 - <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->  
1164 - <!--<if test="autoid != null">-->  
1165 - <!--#{autoid,jdbcType=VARCHAR},-->  
1166 - <!--</if>-->  
1167 - <!--<if test="waybillnomaster != null">-->  
1168 - <!--#{waybillnomaster,jdbcType=VARCHAR},-->  
1169 - <!--</if>-->  
1170 - <!--<if test="waybillnosecondary != null">-->  
1171 - <!--#{waybillnosecondary,jdbcType=VARCHAR},-->  
1172 - <!--</if>-->  
1173 - <!--<if test="totalweight != null">-->  
1174 - <!--#{totalweight,jdbcType=VARCHAR},-->  
1175 - <!--</if>-->  
1176 - <!--<if test="totalpiece != null">-->  
1177 - <!--#{totalpiece,jdbcType=VARCHAR},-->  
1178 - <!--</if>-->  
1179 - <!--<if test="preparepiece != null">-->  
1180 - <!--#{preparepiece,jdbcType=VARCHAR},-->  
1181 - <!--</if>-->  
1182 - <!--<if test="prepareweight != null">-->  
1183 - <!--#{prepareweight,jdbcType=VARCHAR},-->  
1184 - <!--</if>-->  
1185 - <!--<if test="createdate != null">-->  
1186 - <!--#{createdate,jdbcType=TIMESTAMP},-->  
1187 - <!--</if>-->  
1188 - <!--<if test="preparemasterid != null">-->  
1189 - <!--#{preparemasterid,jdbcType=VARCHAR},-->  
1190 - <!--</if>-->  
1191 - <!--<if test="carrier != null">-->  
1192 - <!--#{carrier,jdbcType=VARCHAR},-->  
1193 - <!--</if>-->  
1194 - <!--<if test="flightno != null">-->  
1195 - <!--#{flightno,jdbcType=VARCHAR},-->  
1196 - <!--</if>-->  
1197 - <!--<if test="flightdate != null">-->  
1198 - <!--#{flightdate,jdbcType=TIMESTAMP},-->  
1199 - <!--</if>-->  
1200 - <!--<if test="originatingstation != null">-->  
1201 - <!--#{originatingstation,jdbcType=VARCHAR},-->  
1202 - <!--</if>-->  
1203 - <!--<if test="destinationstation != null">-->  
1204 - <!--#{destinationstation,jdbcType=VARCHAR},-->  
1205 - <!--</if>-->  
1206 - <!--<if test="customsstatus != null">-->  
1207 - <!--#{customsstatus,jdbcType=VARCHAR},-->  
1208 - <!--</if>-->  
1209 - <!--<if test="paymode != null">-->  
1210 - <!--#{paymode,jdbcType=VARCHAR},-->  
1211 - <!--</if>-->  
1212 - <!--<if test="productname != null">-->  
1213 - <!--#{productname,jdbcType=VARCHAR},-->  
1214 - <!--</if>-->  
1215 - <!--<if test="stowagedate != null">-->  
1216 - <!--#{stowagedate,jdbcType=TIMESTAMP},-->  
1217 - <!--</if>-->  
1218 - <!--<if test="customscode != null">-->  
1219 - <!--#{customscode,jdbcType=VARCHAR},-->  
1220 - <!--</if>-->  
1221 - <!--<if test="shippername != null">-->  
1222 - <!--#{shippername,jdbcType=VARCHAR},-->  
1223 - <!--</if>-->  
1224 - <!--<if test="shippercity != null">-->  
1225 - <!--#{shippercity,jdbcType=VARCHAR},-->  
1226 - <!--</if>-->  
1227 - <!--<if test="shipperaddress != null">-->  
1228 - <!--#{shipperaddress,jdbcType=VARCHAR},-->  
1229 - <!--</if>-->  
1230 - <!--<if test="consigneename != null">-->  
1231 - <!--#{consigneename,jdbcType=VARCHAR},-->  
1232 - <!--</if>-->  
1233 - <!--<if test="consigneecity != null">-->  
1234 - <!--#{consigneecity,jdbcType=VARCHAR},-->  
1235 - <!--</if>-->  
1236 - <!--<if test="consigneeaddress != null">-->  
1237 - <!--#{consigneeaddress,jdbcType=VARCHAR},-->  
1238 - <!--</if>-->  
1239 - <!--<if test="receiptinformation != null">-->  
1240 - <!--#{receiptinformation,jdbcType=VARCHAR},-->  
1241 - <!--</if>-->  
1242 - <!--<if test="agentcode != null">-->  
1243 - <!--#{agentcode,jdbcType=VARCHAR},-->  
1244 - <!--</if>-->  
1245 - <!--<if test="agentname != null">-->  
1246 - <!--#{agentname,jdbcType=VARCHAR},-->  
1247 - <!--</if>-->  
1248 - <!--<if test="status != null">-->  
1249 - <!--#{status,jdbcType=VARCHAR},-->  
1250 - <!--</if>-->  
1251 - <!--<if test="shipperCode != null">-->  
1252 - <!--#{shipperCode,jdbcType=VARCHAR},-->  
1253 - <!--</if>-->  
1254 - <!--<if test="shipperCountrycode != null">-->  
1255 - <!--#{shipperCountrycode,jdbcType=VARCHAR},-->  
1256 - <!--</if>-->  
1257 - <!--<if test="shipperPhone != null">-->  
1258 - <!--#{shipperPhone,jdbcType=VARCHAR},-->  
1259 - <!--</if>-->  
1260 - <!--<if test="shipperFax != null">-->  
1261 - <!--#{shipperFax,jdbcType=VARCHAR},-->  
1262 - <!--</if>-->  
1263 - <!--<if test="consigneeCode != null">-->  
1264 - <!--#{consigneeCode,jdbcType=VARCHAR},-->  
1265 - <!--</if>-->  
1266 - <!--<if test="consigneeCountrycode != null">-->  
1267 - <!--#{consigneeCountrycode,jdbcType=VARCHAR},-->  
1268 - <!--</if>-->  
1269 - <!--<if test="consigneePhone != null">-->  
1270 - <!--#{consigneePhone,jdbcType=VARCHAR},-->  
1271 - <!--</if>-->  
1272 - <!--<if test="consigneeFax != null">-->  
1273 - <!--#{consigneeFax,jdbcType=VARCHAR},-->  
1274 - <!--</if>-->  
1275 - <!--<if test="shipperAeo != null">-->  
1276 - <!--#{shipperAeo,jdbcType=VARCHAR},-->  
1277 - <!--</if>-->  
1278 - <!--<if test="consigneeAeo != null">-->  
1279 - <!--#{consigneeAeo,jdbcType=VARCHAR},-->  
1280 - <!--</if>-->  
1281 - <!--<if test="unloadingstation != null">-->  
1282 - <!--#{unloadingstation,jdbcType=VARCHAR},-->  
1283 - <!--</if>-->  
1284 - <!--</trim>-->  
1285 - <!--</insert>-->  
1286 967
1287 968
1288 <update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" > 969 <update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" >