WLPT_CLOUD / Base_Model · 提交

转到一个项目

作者 朱兆平
提交 51756e4c103bc2383a75cd5ec0d46527a10a5121 1 个父辈 ec54aff6

进港model增加了一些校验方法及数据库入库操作

内嵌 并排对比
正在显示 9 个修改的文件 包含 261 行增加 和 115 行删除
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <packaging>jar</packaging> 6 <packaging>jar</packaging>
7 <groupId>com.sunyo.wlpt</groupId> 7 <groupId>com.sunyo.wlpt</groupId>
8 <artifactId>base</artifactId> 8 <artifactId>base</artifactId>
9 - <version>1.03-SNAPSHOT</version> 9 + <version>1.05-SNAPSHOT</version>
10 10
11 <name>wlpt-base</name> 11 <name>wlpt-base</name>
12 <description>物流平台基础实体包</description> 12 <description>物流平台基础实体包</description>
@@ -11,7 +11,9 @@ public interface AWB_AWBINFOMapper { @@ -11,7 +11,9 @@ public interface AWB_AWBINFOMapper {
11 11
12 AWB_AWBINFO selectByPrimaryKey(String billid); 12 AWB_AWBINFO selectByPrimaryKey(String billid);
13 13
  14 + int hasWaybill(AWB_AWBINFO record);
  15 +
14 int updateByPrimaryKeySelective(AWB_AWBINFO record); 16 int updateByPrimaryKeySelective(AWB_AWBINFO record);
15 17
16 int updateByPrimaryKey(AWB_AWBINFO record); 18 int updateByPrimaryKey(AWB_AWBINFO record);
17 -}  
  19 +}
@@ -11,6 +11,8 @@ public interface NMMS_CUSTOM_MT1201Mapper { @@ -11,6 +11,8 @@ public interface NMMS_CUSTOM_MT1201Mapper {
11 11
12 NMMS_CUSTOM_MT1201 selectByPrimaryKey(String uuid); 12 NMMS_CUSTOM_MT1201 selectByPrimaryKey(String uuid);
13 13
  14 + int hasWaybill(NMMS_CUSTOM_MT1201 record);
  15 +
14 int updateByPrimaryKeySelective(NMMS_CUSTOM_MT1201 record); 16 int updateByPrimaryKeySelective(NMMS_CUSTOM_MT1201 record);
15 17
16 int updateByPrimaryKey(NMMS_CUSTOM_MT1201 record); 18 int updateByPrimaryKey(NMMS_CUSTOM_MT1201 record);
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
3 import com.fasterxml.jackson.annotation.JsonFormat; 3 import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.sunyo.wlpt.base.model.exception.NMMSException;
4 import lombok.Data; 5 import lombok.Data;
5 6
6 import java.math.BigDecimal; 7 import java.math.BigDecimal;
@@ -1313,4 +1314,22 @@ public class AWB_AWBINFO { @@ -1313,4 +1314,22 @@ public class AWB_AWBINFO {
1313 public void setCnscomidno(String cnscomidno) { 1314 public void setCnscomidno(String cnscomidno) {
1314 this.cnscomidno = cnscomidno; 1315 this.cnscomidno = cnscomidno;
1315 } 1316 }
  1317 +
  1318 + /**
  1319 + * 根据原始舱单主单号,set stockpre and stockno
  1320 + * 主单通过 "-" 符号进行拆分
  1321 + * "-"号前的为stockpre
  1322 + * "-"号后面的为 stockno
  1323 + * @param mt1201 原始舱单
  1324 + * @throws NMMSException 的awba 为空 或者 长度>3 不够位数 或者不包含"-"符号会抛出 AWBAFORMAT 自定义异常
  1325 + */
  1326 + public void setStockWithMT1201_AWBA(NMMS_CUSTOM_MT1201 mt1201) throws NMMSException{
  1327 + if (mt1201.getAwba() != null && mt1201.getAwba().contains("-") && mt1201.getAwba().length()>4) {
  1328 + String[] awb = mt1201.getAwba().split("-");
  1329 + this.stockpre = awb[0];
  1330 + this.stockno = awb[1];
  1331 + }else {
  1332 + throw new NMMSException("错误的主运单格式:"+mt1201.getAwba());
  1333 + }
  1334 + }
1316 } 1335 }
1 package com.sunyo.wlpt.base.model; 1 package com.sunyo.wlpt.base.model;
2 2
3 import com.fasterxml.jackson.annotation.JsonFormat; 3 import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.sunyo.wlpt.base.model.exception.NMMSException;
4 import lombok.Data; 5 import lombok.Data;
5 import org.springframework.format.annotation.DateTimeFormat; 6 import org.springframework.format.annotation.DateTimeFormat;
6 7
@@ -70,4 +71,17 @@ public class NMMS_CUSTOM_MT1201 { @@ -70,4 +71,17 @@ public class NMMS_CUSTOM_MT1201 {
70 71
71 private String customtype; 72 private String customtype;
72 73
  74 + /**
  75 + * 格式化主运单号,插入 "-" 符号,有 "-" 符号则不更改格式
  76 + */
  77 + public void formatAwba() {
  78 + String spacialCode = "-";
  79 + if (awba!=null && awba.length()>3 && !awba.contains(spacialCode)){
  80 + StringBuffer stringBuffer = new StringBuffer(awba);
  81 + stringBuffer.insert(3, "-");
  82 + this.awba = stringBuffer.toString().trim();
  83 + }else {
  84 + //throw new NMMSException("错误的主运单号,不能为空或者长度未大于4:"+awba);
  85 + }
  86 + }
73 } 87 }
@@ -250,4 +250,58 @@ public class NMMS_CUSTOM_MT520X { @@ -250,4 +250,58 @@ public class NMMS_CUSTOM_MT520X {
250 public void setExt5(String ext5) { 250 public void setExt5(String ext5) {
251 this.ext5 = ext5 == null ? null : ext5.trim(); 251 this.ext5 = ext5 == null ? null : ext5.trim();
252 } 252 }
  253 +
  254 + public String getCarrierno() {
  255 + return carrierno;
  256 + }
  257 +
  258 + public void setCarrierno(String carrierno) {
  259 + this.carrierno = carrierno;
  260 + }
  261 +
  262 + public String getSegment() {
  263 + return segment;
  264 + }
  265 +
  266 + public void setSegment(String segment) {
  267 + this.segment = segment;
  268 + }
  269 +
  270 + public String getWaybill() {
  271 + return waybill;
  272 + }
  273 +
  274 + public void setWaybill(String waybill) {
  275 + this.waybill = waybill;
  276 + }
  277 +
  278 + public String getCustomText() {
  279 + return customText;
  280 + }
  281 +
  282 + public void setCustomText(String customText) {
  283 + this.customText = customText;
  284 + }
  285 +
  286 + public AWB_AWBINFO getAwbinfo() {
  287 + return awbinfo;
  288 + }
  289 +
  290 + public void setAwbinfo(AWB_AWBINFO awbinfo) {
  291 + this.awbinfo = awbinfo;
  292 + }
  293 +
  294 + public List<NMMS_CUSTOM_MT520X> getChildren() {
  295 + return children;
  296 + }
  297 +
  298 + public void setChildren(List<NMMS_CUSTOM_MT520X> children) {
  299 + this.children = children;
  300 + }
  301 +
  302 +
  303 + @Override
  304 + public String toString(){
  305 + return "Mt520x class";
  306 + }
253 } 307 }
  1 +package com.sunyo.wlpt.base.model.exception;
  2 +
  3 +public class NMMSException extends RuntimeException{
  4 +
  5 + public NMMSException(String message) {
  6 + super(message);
  7 + }
  8 +
  9 + public NMMSException(String message, Throwable cause) {
  10 + super(message, cause);
  11 + }
  12 +}
@@ -128,116 +128,131 @@ @@ -128,116 +128,131 @@
128 <result column="OPTIME" property="optime" jdbcType="TIMESTAMP" /> 128 <result column="OPTIME" property="optime" jdbcType="TIMESTAMP" />
129 </resultMap> 129 </resultMap>
130 <sql id="Base_Column_List" > 130 <sql id="Base_Column_List" >
131 - BILLID, STOCKTYPEID, STOCKPRE, STOCKNO, PRODUCTID, CARRIERPRODUCTID, DELFLAG, PREVIOUSBILLID,  
132 - DOMINT, CUSTOMCTL, SPECOPEID, SPECOPEIDEXT, SAIRPORTID, SCITYID, EAIRPORTID, ECITYID,  
133 - BY1, DEST1, DEST1CITY, BY2, DEST2, DEST2CITY, BY3, DEST3, DEST3CITY, BY4, DEST4,  
134 - DEST4CITY, CARGONO, CARGONM, PACK, MEAS, PCS, WEIGHT, FEEWT, VOL, CTRLOPEDEPARTMENT,  
135 - SHPRNAME, SHPRMOBILETYPE, SHPRTEL, SHPRADDRESS, SHPRCOUNTYR, SHPCOMID, SHPAEOCODE,  
136 - SHPCUSTOMERID, CNSNNAME, CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS, CNSCOUNTYR, CNSCOMID,  
137 - CNSAEOCODE, CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID, COLLECTED, EXCHAGERATE, COMAT,  
138 - REFRIGERATED, FORKNUM, WHSHOLD, EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS, SHORTTRANSBUP,  
139 - CARGOOWNER, CHARGETIME, ISINSTRUCTION, NOTIFY, SHIPPERVALUE, TRAFFICVALUE, CUSTOMVALUE,  
140 - INSUREVALUE, FILEATTACHED, RATETYPE, PROCESSINGMETHOD, HANDLINGCIRCS, RESERVEDTONNAGE,  
141 - CARRIAGE, RATE, CRTOPER, WTUNIT, ORIGINALWT, ORIGINALFEEWT, VOLUNIT, CURRENCYID,  
142 - ORIGINALVOL, CRTOPETIME, DLVPRIORITY, CHKED, LABELNUM, SHPCUSTOMER, CRTAGENT, CRTDATE,  
143 - EXTRAWEIGHT, STOREREMARK, BALANCEREMARK, FILECHKED, ISCARBALANCE, CNSNIDCARD, CIQCHECK,  
144 - TMPBILLNO, SUBBILLID, ISTRANS, SPLITTAG, CUSTOMSTRANS, ENDOPER, ENDOPETIME, CONFIRMOPER,  
145 - CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID, CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK, 131 + BILLID, STOCKTYPEID, STOCKPRE, STOCKNO, PRODUCTID, CARRIERPRODUCTID, DELFLAG, PREVIOUSBILLID,
  132 + DOMINT, CUSTOMCTL, SPECOPEID, SPECOPEIDEXT, SAIRPORTID, SCITYID, EAIRPORTID, ECITYID,
  133 + BY1, DEST1, DEST1CITY, BY2, DEST2, DEST2CITY, BY3, DEST3, DEST3CITY, BY4, DEST4,
  134 + DEST4CITY, CARGONO, CARGONM, PACK, MEAS, PCS, WEIGHT, FEEWT, VOL, CTRLOPEDEPARTMENT,
  135 + SHPRNAME, SHPRMOBILETYPE, SHPRTEL, SHPRADDRESS, SHPRCOUNTYR, SHPCOMID, SHPAEOCODE,
  136 + SHPCUSTOMERID, CNSNNAME, CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS, CNSCOUNTYR, CNSCOMID,
  137 + CNSAEOCODE, CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID, COLLECTED, EXCHAGERATE, COMAT,
  138 + REFRIGERATED, FORKNUM, WHSHOLD, EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS, SHORTTRANSBUP,
  139 + CARGOOWNER, CHARGETIME, ISINSTRUCTION, NOTIFY, SHIPPERVALUE, TRAFFICVALUE, CUSTOMVALUE,
  140 + INSUREVALUE, FILEATTACHED, RATETYPE, PROCESSINGMETHOD, HANDLINGCIRCS, RESERVEDTONNAGE,
  141 + CARRIAGE, RATE, CRTOPER, WTUNIT, ORIGINALWT, ORIGINALFEEWT, VOLUNIT, CURRENCYID,
  142 + ORIGINALVOL, CRTOPETIME, DLVPRIORITY, CHKED, LABELNUM, SHPCUSTOMER, CRTAGENT, CRTDATE,
  143 + EXTRAWEIGHT, STOREREMARK, BALANCEREMARK, FILECHKED, ISCARBALANCE, CNSNIDCARD, CIQCHECK,
  144 + TMPBILLNO, SUBBILLID, ISTRANS, SPLITTAG, CUSTOMSTRANS, ENDOPER, ENDOPETIME, CONFIRMOPER,
  145 + CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID, CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK,
146 CARGOSOURCE, CARGONMCH, ISDGR, PERCENT, AWBTYPE, STATUS, PAYMODEL, ISDELETE, OPTIME 146 CARGOSOURCE, CARGONMCH, ISDGR, PERCENT, AWBTYPE, STATUS, PAYMODEL, ISDELETE, OPTIME
147 </sql> 147 </sql>
148 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > 148 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
149 - select 149 + select
150 <include refid="Base_Column_List" /> 150 <include refid="Base_Column_List" />
151 from T_FIL_AWBINFO 151 from T_FIL_AWBINFO
152 where BILLID = #{billid,jdbcType=VARCHAR} 152 where BILLID = #{billid,jdbcType=VARCHAR}
153 </select> 153 </select>
  154 + <select id="hasWaybill" resultType="java.lang.Integer" parameterType="com.sunyo.wlpt.base.model.AWB_AWBINFO" >
  155 + select count(*)
  156 + from T_FIL_AWBINFO
  157 + <where>
  158 + <if test="stockpre != null" >
  159 + AND STOCKPRE = #{stockpre,jdbcType=VARCHAR}
  160 + </if>
  161 + <if test="stockno != null" >
  162 + AND STOCKNO = #{stockno,jdbcType=VARCHAR}
  163 + </if>
  164 + <if test="stocktypeid != null" >
  165 + AND STOCKTYPEID = #{stocktypeid,jdbcType=VARCHAR}
  166 + </if>
  167 + </where>
  168 + </select>
154 <delete id="deleteByPrimaryKey" parameterType="java.lang.String" > 169 <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
155 delete from T_FIL_AWBINFO 170 delete from T_FIL_AWBINFO
156 where BILLID = #{billid,jdbcType=VARCHAR} 171 where BILLID = #{billid,jdbcType=VARCHAR}
157 </delete> 172 </delete>
158 <insert id="insert" parameterType="com.sunyo.wlpt.base.model.AWB_AWBINFO" > 173 <insert id="insert" parameterType="com.sunyo.wlpt.base.model.AWB_AWBINFO" >
159 - insert into T_FIL_AWBINFO (BILLID, STOCKTYPEID, STOCKPRE,  
160 - STOCKNO, PRODUCTID, CARRIERPRODUCTID,  
161 - DELFLAG, PREVIOUSBILLID, DOMINT,  
162 - CUSTOMCTL, SPECOPEID, SPECOPEIDEXT,  
163 - SAIRPORTID, SCITYID, EAIRPORTID,  
164 - ECITYID, BY1, DEST1,  
165 - DEST1CITY, BY2, DEST2,  
166 - DEST2CITY, BY3, DEST3,  
167 - DEST3CITY, BY4, DEST4,  
168 - DEST4CITY, CARGONO, CARGONM,  
169 - PACK, MEAS, PCS, WEIGHT,  
170 - FEEWT, VOL, CTRLOPEDEPARTMENT,  
171 - SHPRNAME, SHPRMOBILETYPE, SHPRTEL,  
172 - SHPRADDRESS, SHPRCOUNTYR, SHPCOMID,  
173 - SHPAEOCODE, SHPCUSTOMERID, CNSNNAME,  
174 - CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS,  
175 - CNSCOUNTYR, CNSCOMID, CNSAEOCODE,  
176 - CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID,  
177 - COLLECTED, EXCHAGERATE, COMAT,  
178 - REFRIGERATED, FORKNUM, WHSHOLD,  
179 - EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS,  
180 - SHORTTRANSBUP, CARGOOWNER, CHARGETIME,  
181 - ISINSTRUCTION, NOTIFY, SHIPPERVALUE,  
182 - TRAFFICVALUE, CUSTOMVALUE, INSUREVALUE,  
183 - FILEATTACHED, RATETYPE, PROCESSINGMETHOD,  
184 - HANDLINGCIRCS, RESERVEDTONNAGE, CARRIAGE,  
185 - RATE, CRTOPER, WTUNIT,  
186 - ORIGINALWT, ORIGINALFEEWT, VOLUNIT,  
187 - CURRENCYID, ORIGINALVOL, CRTOPETIME,  
188 - DLVPRIORITY, CHKED, LABELNUM,  
189 - SHPCUSTOMER, CRTAGENT, CRTDATE,  
190 - EXTRAWEIGHT, STOREREMARK, BALANCEREMARK,  
191 - FILECHKED, ISCARBALANCE, CNSNIDCARD,  
192 - CIQCHECK, TMPBILLNO, SUBBILLID,  
193 - ISTRANS, SPLITTAG, CUSTOMSTRANS,  
194 - ENDOPER, ENDOPETIME, CONFIRMOPER,  
195 - CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID,  
196 - CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK,  
197 - CARGOSOURCE, CARGONMCH, ISDGR,  
198 - PERCENT, AWBTYPE, STATUS, 174 + insert into T_FIL_AWBINFO (BILLID, STOCKTYPEID, STOCKPRE,
  175 + STOCKNO, PRODUCTID, CARRIERPRODUCTID,
  176 + DELFLAG, PREVIOUSBILLID, DOMINT,
  177 + CUSTOMCTL, SPECOPEID, SPECOPEIDEXT,
  178 + SAIRPORTID, SCITYID, EAIRPORTID,
  179 + ECITYID, BY1, DEST1,
  180 + DEST1CITY, BY2, DEST2,
  181 + DEST2CITY, BY3, DEST3,
  182 + DEST3CITY, BY4, DEST4,
  183 + DEST4CITY, CARGONO, CARGONM,
  184 + PACK, MEAS, PCS, WEIGHT,
  185 + FEEWT, VOL, CTRLOPEDEPARTMENT,
  186 + SHPRNAME, SHPRMOBILETYPE, SHPRTEL,
  187 + SHPRADDRESS, SHPRCOUNTYR, SHPCOMID,
  188 + SHPAEOCODE, SHPCUSTOMERID, CNSNNAME,
  189 + CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS,
  190 + CNSCOUNTYR, CNSCOMID, CNSAEOCODE,
  191 + CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID,
  192 + COLLECTED, EXCHAGERATE, COMAT,
  193 + REFRIGERATED, FORKNUM, WHSHOLD,
  194 + EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS,
  195 + SHORTTRANSBUP, CARGOOWNER, CHARGETIME,
  196 + ISINSTRUCTION, NOTIFY, SHIPPERVALUE,
  197 + TRAFFICVALUE, CUSTOMVALUE, INSUREVALUE,
  198 + FILEATTACHED, RATETYPE, PROCESSINGMETHOD,
  199 + HANDLINGCIRCS, RESERVEDTONNAGE, CARRIAGE,
  200 + RATE, CRTOPER, WTUNIT,
  201 + ORIGINALWT, ORIGINALFEEWT, VOLUNIT,
  202 + CURRENCYID, ORIGINALVOL, CRTOPETIME,
  203 + DLVPRIORITY, CHKED, LABELNUM,
  204 + SHPCUSTOMER, CRTAGENT, CRTDATE,
  205 + EXTRAWEIGHT, STOREREMARK, BALANCEREMARK,
  206 + FILECHKED, ISCARBALANCE, CNSNIDCARD,
  207 + CIQCHECK, TMPBILLNO, SUBBILLID,
  208 + ISTRANS, SPLITTAG, CUSTOMSTRANS,
  209 + ENDOPER, ENDOPETIME, CONFIRMOPER,
  210 + CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID,
  211 + CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK,
  212 + CARGOSOURCE, CARGONMCH, ISDGR,
  213 + PERCENT, AWBTYPE, STATUS,
199 PAYMODEL, ISDELETE, OPTIME 214 PAYMODEL, ISDELETE, OPTIME
200 ) 215 )
201 - values (#{billid,jdbcType=VARCHAR}, #{stocktypeid,jdbcType=VARCHAR}, #{stockpre,jdbcType=VARCHAR},  
202 - #{stockno,jdbcType=VARCHAR}, #{productid,jdbcType=VARCHAR}, #{carrierproductid,jdbcType=VARCHAR},  
203 - #{delflag,jdbcType=VARCHAR}, #{previousbillid,jdbcType=VARCHAR}, #{domint,jdbcType=VARCHAR},  
204 - #{customctl,jdbcType=VARCHAR}, #{specopeid,jdbcType=VARCHAR}, #{specopeidext,jdbcType=VARCHAR},  
205 - #{sairportid,jdbcType=VARCHAR}, #{scityid,jdbcType=VARCHAR}, #{eairportid,jdbcType=VARCHAR},  
206 - #{ecityid,jdbcType=VARCHAR}, #{by1,jdbcType=VARCHAR}, #{dest1,jdbcType=VARCHAR},  
207 - #{dest1city,jdbcType=VARCHAR}, #{by2,jdbcType=VARCHAR}, #{dest2,jdbcType=VARCHAR},  
208 - #{dest2city,jdbcType=VARCHAR}, #{by3,jdbcType=VARCHAR}, #{dest3,jdbcType=VARCHAR},  
209 - #{dest3city,jdbcType=VARCHAR}, #{by4,jdbcType=VARCHAR}, #{dest4,jdbcType=VARCHAR},  
210 - #{dest4city,jdbcType=VARCHAR}, #{cargono,jdbcType=VARCHAR}, #{cargonm,jdbcType=VARCHAR},  
211 - #{pack,jdbcType=VARCHAR}, #{meas,jdbcType=VARCHAR}, #{pcs,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL},  
212 - #{feewt,jdbcType=DECIMAL}, #{vol,jdbcType=DECIMAL}, #{ctrlopedepartment,jdbcType=VARCHAR},  
213 - #{shprname,jdbcType=VARCHAR}, #{shprmobiletype,jdbcType=VARCHAR}, #{shprtel,jdbcType=VARCHAR},  
214 - #{shpraddress,jdbcType=VARCHAR}, #{shprcountyr,jdbcType=VARCHAR}, #{shpcomid,jdbcType=VARCHAR},  
215 - #{shpaeocode,jdbcType=VARCHAR}, #{shpcustomerid,jdbcType=VARCHAR}, #{cnsnname,jdbcType=VARCHAR},  
216 - #{cnsrmobiletype,jdbcType=VARCHAR}, #{cnsntel,jdbcType=VARCHAR}, #{cnsnaddress,jdbcType=VARCHAR},  
217 - #{cnscountyr,jdbcType=VARCHAR}, #{cnscomid,jdbcType=VARCHAR}, #{cnsaeocode,jdbcType=VARCHAR},  
218 - #{cnsrctcname,jdbcType=VARCHAR}, #{cnsrctctel,jdbcType=VARCHAR}, #{csgcustomerid,jdbcType=VARCHAR},  
219 - #{collected,jdbcType=VARCHAR}, #{exchagerate,jdbcType=DECIMAL}, #{comat,jdbcType=VARCHAR},  
220 - #{refrigerated,jdbcType=VARCHAR}, #{forknum,jdbcType=DECIMAL}, #{whshold,jdbcType=VARCHAR},  
221 - #{expcusttransit,jdbcType=VARCHAR}, #{impcusttransit,jdbcType=VARCHAR}, #{shorttrans,jdbcType=VARCHAR},  
222 - #{shorttransbup,jdbcType=VARCHAR}, #{cargoowner,jdbcType=VARCHAR}, #{chargetime,jdbcType=TIMESTAMP},  
223 - #{isinstruction,jdbcType=VARCHAR}, #{notify,jdbcType=VARCHAR}, #{shippervalue,jdbcType=DECIMAL},  
224 - #{trafficvalue,jdbcType=DECIMAL}, #{customvalue,jdbcType=DECIMAL}, #{insurevalue,jdbcType=DECIMAL},  
225 - #{fileattached,jdbcType=VARCHAR}, #{ratetype,jdbcType=VARCHAR}, #{processingmethod,jdbcType=VARCHAR},  
226 - #{handlingcircs,jdbcType=VARCHAR}, #{reservedtonnage,jdbcType=VARCHAR}, #{carriage,jdbcType=DECIMAL},  
227 - #{rate,jdbcType=DECIMAL}, #{crtoper,jdbcType=VARCHAR}, #{wtunit,jdbcType=VARCHAR},  
228 - #{originalwt,jdbcType=DECIMAL}, #{originalfeewt,jdbcType=DECIMAL}, #{volunit,jdbcType=VARCHAR},  
229 - #{currencyid,jdbcType=VARCHAR}, #{originalvol,jdbcType=DECIMAL}, #{crtopetime,jdbcType=TIMESTAMP},  
230 - #{dlvpriority,jdbcType=CHAR}, #{chked,jdbcType=VARCHAR}, #{labelnum,jdbcType=DECIMAL},  
231 - #{shpcustomer,jdbcType=VARCHAR}, #{crtagent,jdbcType=VARCHAR}, #{crtdate,jdbcType=TIMESTAMP},  
232 - #{extraweight,jdbcType=DECIMAL}, #{storeremark,jdbcType=VARCHAR}, #{balanceremark,jdbcType=VARCHAR},  
233 - #{filechked,jdbcType=VARCHAR}, #{iscarbalance,jdbcType=VARCHAR}, #{cnsnidcard,jdbcType=VARCHAR},  
234 - #{ciqcheck,jdbcType=CHAR}, #{tmpbillno,jdbcType=VARCHAR}, #{subbillid,jdbcType=VARCHAR},  
235 - #{istrans,jdbcType=VARCHAR}, #{splittag,jdbcType=CHAR}, #{customstrans,jdbcType=CHAR},  
236 - #{endoper,jdbcType=VARCHAR}, #{endopetime,jdbcType=TIMESTAMP}, #{confirmoper,jdbcType=VARCHAR},  
237 - #{confirmopetime,jdbcType=TIMESTAMP}, #{csgcustomer,jdbcType=VARCHAR}, #{relationbillid,jdbcType=VARCHAR},  
238 - #{customsCountry,jdbcType=VARCHAR}, #{customsCity,jdbcType=VARCHAR}, #{customsRemark,jdbcType=VARCHAR},  
239 - #{cargosource,jdbcType=VARCHAR}, #{cargonmch,jdbcType=VARCHAR}, #{isdgr,jdbcType=VARCHAR},  
240 - #{percent,jdbcType=DECIMAL}, #{awbtype,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 216 + values (#{billid,jdbcType=VARCHAR}, #{stocktypeid,jdbcType=VARCHAR}, #{stockpre,jdbcType=VARCHAR},
  217 + #{stockno,jdbcType=VARCHAR}, #{productid,jdbcType=VARCHAR}, #{carrierproductid,jdbcType=VARCHAR},
  218 + #{delflag,jdbcType=VARCHAR}, #{previousbillid,jdbcType=VARCHAR}, #{domint,jdbcType=VARCHAR},
  219 + #{customctl,jdbcType=VARCHAR}, #{specopeid,jdbcType=VARCHAR}, #{specopeidext,jdbcType=VARCHAR},
  220 + #{sairportid,jdbcType=VARCHAR}, #{scityid,jdbcType=VARCHAR}, #{eairportid,jdbcType=VARCHAR},
  221 + #{ecityid,jdbcType=VARCHAR}, #{by1,jdbcType=VARCHAR}, #{dest1,jdbcType=VARCHAR},
  222 + #{dest1city,jdbcType=VARCHAR}, #{by2,jdbcType=VARCHAR}, #{dest2,jdbcType=VARCHAR},
  223 + #{dest2city,jdbcType=VARCHAR}, #{by3,jdbcType=VARCHAR}, #{dest3,jdbcType=VARCHAR},
  224 + #{dest3city,jdbcType=VARCHAR}, #{by4,jdbcType=VARCHAR}, #{dest4,jdbcType=VARCHAR},
  225 + #{dest4city,jdbcType=VARCHAR}, #{cargono,jdbcType=VARCHAR}, #{cargonm,jdbcType=VARCHAR},
  226 + #{pack,jdbcType=VARCHAR}, #{meas,jdbcType=VARCHAR}, #{pcs,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL},
  227 + #{feewt,jdbcType=DECIMAL}, #{vol,jdbcType=DECIMAL}, #{ctrlopedepartment,jdbcType=VARCHAR},
  228 + #{shprname,jdbcType=VARCHAR}, #{shprmobiletype,jdbcType=VARCHAR}, #{shprtel,jdbcType=VARCHAR},
  229 + #{shpraddress,jdbcType=VARCHAR}, #{shprcountyr,jdbcType=VARCHAR}, #{shpcomid,jdbcType=VARCHAR},
  230 + #{shpaeocode,jdbcType=VARCHAR}, #{shpcustomerid,jdbcType=VARCHAR}, #{cnsnname,jdbcType=VARCHAR},
  231 + #{cnsrmobiletype,jdbcType=VARCHAR}, #{cnsntel,jdbcType=VARCHAR}, #{cnsnaddress,jdbcType=VARCHAR},
  232 + #{cnscountyr,jdbcType=VARCHAR}, #{cnscomid,jdbcType=VARCHAR}, #{cnsaeocode,jdbcType=VARCHAR},
  233 + #{cnsrctcname,jdbcType=VARCHAR}, #{cnsrctctel,jdbcType=VARCHAR}, #{csgcustomerid,jdbcType=VARCHAR},
  234 + #{collected,jdbcType=VARCHAR}, #{exchagerate,jdbcType=DECIMAL}, #{comat,jdbcType=VARCHAR},
  235 + #{refrigerated,jdbcType=VARCHAR}, #{forknum,jdbcType=DECIMAL}, #{whshold,jdbcType=VARCHAR},
  236 + #{expcusttransit,jdbcType=VARCHAR}, #{impcusttransit,jdbcType=VARCHAR}, #{shorttrans,jdbcType=VARCHAR},
  237 + #{shorttransbup,jdbcType=VARCHAR}, #{cargoowner,jdbcType=VARCHAR}, #{chargetime,jdbcType=TIMESTAMP},
  238 + #{isinstruction,jdbcType=VARCHAR}, #{notify,jdbcType=VARCHAR}, #{shippervalue,jdbcType=DECIMAL},
  239 + #{trafficvalue,jdbcType=DECIMAL}, #{customvalue,jdbcType=DECIMAL}, #{insurevalue,jdbcType=DECIMAL},
  240 + #{fileattached,jdbcType=VARCHAR}, #{ratetype,jdbcType=VARCHAR}, #{processingmethod,jdbcType=VARCHAR},
  241 + #{handlingcircs,jdbcType=VARCHAR}, #{reservedtonnage,jdbcType=VARCHAR}, #{carriage,jdbcType=DECIMAL},
  242 + #{rate,jdbcType=DECIMAL}, #{crtoper,jdbcType=VARCHAR}, #{wtunit,jdbcType=VARCHAR},
  243 + #{originalwt,jdbcType=DECIMAL}, #{originalfeewt,jdbcType=DECIMAL}, #{volunit,jdbcType=VARCHAR},
  244 + #{currencyid,jdbcType=VARCHAR}, #{originalvol,jdbcType=DECIMAL}, #{crtopetime,jdbcType=TIMESTAMP},
  245 + #{dlvpriority,jdbcType=CHAR}, #{chked,jdbcType=VARCHAR}, #{labelnum,jdbcType=DECIMAL},
  246 + #{shpcustomer,jdbcType=VARCHAR}, #{crtagent,jdbcType=VARCHAR}, #{crtdate,jdbcType=TIMESTAMP},
  247 + #{extraweight,jdbcType=DECIMAL}, #{storeremark,jdbcType=VARCHAR}, #{balanceremark,jdbcType=VARCHAR},
  248 + #{filechked,jdbcType=VARCHAR}, #{iscarbalance,jdbcType=VARCHAR}, #{cnsnidcard,jdbcType=VARCHAR},
  249 + #{ciqcheck,jdbcType=CHAR}, #{tmpbillno,jdbcType=VARCHAR}, #{subbillid,jdbcType=VARCHAR},
  250 + #{istrans,jdbcType=VARCHAR}, #{splittag,jdbcType=CHAR}, #{customstrans,jdbcType=CHAR},
  251 + #{endoper,jdbcType=VARCHAR}, #{endopetime,jdbcType=TIMESTAMP}, #{confirmoper,jdbcType=VARCHAR},
  252 + #{confirmopetime,jdbcType=TIMESTAMP}, #{csgcustomer,jdbcType=VARCHAR}, #{relationbillid,jdbcType=VARCHAR},
  253 + #{customsCountry,jdbcType=VARCHAR}, #{customsCity,jdbcType=VARCHAR}, #{customsRemark,jdbcType=VARCHAR},
  254 + #{cargosource,jdbcType=VARCHAR}, #{cargonmch,jdbcType=VARCHAR}, #{isdgr,jdbcType=VARCHAR},
  255 + #{percent,jdbcType=DECIMAL}, #{awbtype,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
241 #{paymodel,jdbcType=VARCHAR}, #{isdelete,jdbcType=BIT}, #{optime,jdbcType=TIMESTAMP} 256 #{paymodel,jdbcType=VARCHAR}, #{isdelete,jdbcType=BIT}, #{optime,jdbcType=TIMESTAMP}
242 ) 257 )
243 </insert> 258 </insert>
@@ -1494,4 +1509,4 @@ @@ -1494,4 +1509,4 @@
1494 OPTIME = #{optime,jdbcType=TIMESTAMP} 1509 OPTIME = #{optime,jdbcType=TIMESTAMP}
1495 where BILLID = #{billid,jdbcType=VARCHAR} 1510 where BILLID = #{billid,jdbcType=VARCHAR}
1496 </update> 1511 </update>
1497 -</mapper>  
  1512 +</mapper>
@@ -25,35 +25,63 @@ @@ -25,35 +25,63 @@
25 <result column="ext5" property="ext5" jdbcType="VARCHAR" /> 25 <result column="ext5" property="ext5" jdbcType="VARCHAR" />
26 </resultMap> 26 </resultMap>
27 <sql id="Base_Column_List" > 27 <sql id="Base_Column_List" >
28 - uuid, awba, awbh, customCode, goodsName, acTime, carrier, flightNo, flightDate, originStation,  
29 - destinationStation, piece, weight, splitCode, status, isDelete, uldType, uldNo, planeNo, 28 + uuid, awba, awbh, customCode, goodsName, acTime, carrier, flightNo, flightDate, originStation,
  29 + destinationStation, piece, weight, splitCode, status, isDelete, uldType, uldNo, planeNo,
30 opeuserid, ext5 30 opeuserid, ext5
31 </sql> 31 </sql>
32 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > 32 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
33 - select 33 + select
34 <include refid="Base_Column_List" /> 34 <include refid="Base_Column_List" />
35 from CUSTOM_MT1201 35 from CUSTOM_MT1201
36 where uuid = #{uuid,jdbcType=VARCHAR} 36 where uuid = #{uuid,jdbcType=VARCHAR}
37 </select> 37 </select>
  38 + <select id="hasWaybill" resultType="java.lang.Integer" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201" >
  39 + select count(*) from (
  40 + select
  41 + count(uuid) as counts
  42 + from CUSTOM_MT1201
  43 + <where>
  44 + <if test="flightdate !=null">
  45 + AND flightDate = #{flightdate,jdbcType=DATE}
  46 + </if>
  47 + <if test="carrier!=null">
  48 + AND carrier = #{carrier,jdbcType=VARCHAR}
  49 + </if>
  50 + <if test="flightno!=null">
  51 + AND flightNo = #{flightno,jdbcType=VARCHAR}
  52 + </if>
  53 + <if test="awba!=null and awba != ''">
  54 + AND awba=#{awba,jdbcType=VARCHAR}
  55 + </if>
  56 + <if test="awbh!=null">
  57 + AND awbh=#{awbh,jdbcType=VARCHAR}
  58 + </if>
  59 + </where>
  60 + union
  61 + select count(uuid) as counts
  62 + from CUSTOM_MT1201
  63 + where uuid = #{uuid,jdbcType=VARCHAR}
  64 + ) t where counts>0
  65 + </select>
38 <delete id="deleteByPrimaryKey" parameterType="java.lang.String" > 66 <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
39 delete from CUSTOM_MT1201 67 delete from CUSTOM_MT1201
40 where uuid = #{uuid,jdbcType=VARCHAR} 68 where uuid = #{uuid,jdbcType=VARCHAR}
41 </delete> 69 </delete>
42 <insert id="insert" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201" > 70 <insert id="insert" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201" >
43 - insert into CUSTOM_MT1201 (uuid, awba, awbh,  
44 - customCode, goodsName, acTime,  
45 - carrier, flightNo, flightDate,  
46 - originStation, destinationStation, piece,  
47 - weight, splitCode, status,  
48 - isDelete, uldType, uldNo, 71 + insert into CUSTOM_MT1201 (uuid, awba, awbh,
  72 + customCode, goodsName, acTime,
  73 + carrier, flightNo, flightDate,
  74 + originStation, destinationStation, piece,
  75 + weight, splitCode, status,
  76 + isDelete, uldType, uldNo,
49 planeNo, opeuserid, ext5 77 planeNo, opeuserid, ext5
50 ) 78 )
51 - values (#{uuid,jdbcType=VARCHAR}, #{awba,jdbcType=VARCHAR}, #{awbh,jdbcType=VARCHAR},  
52 - #{customcode,jdbcType=VARCHAR}, #{goodsname,jdbcType=VARCHAR}, #{actime,jdbcType=TIMESTAMP},  
53 - #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE},  
54 - #{originstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, #{piece,jdbcType=INTEGER},  
55 - #{weight,jdbcType=DECIMAL}, #{splitcode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},  
56 - #{isdelete,jdbcType=BIT}, #{uldtype,jdbcType=VARCHAR}, #{uldno,jdbcType=VARCHAR}, 79 + values (#{uuid,jdbcType=VARCHAR}, #{awba,jdbcType=VARCHAR}, #{awbh,jdbcType=VARCHAR},
  80 + #{customcode,jdbcType=VARCHAR}, #{goodsname,jdbcType=VARCHAR}, #{actime,jdbcType=TIMESTAMP},
  81 + #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE},
  82 + #{originstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, #{piece,jdbcType=INTEGER},
  83 + #{weight,jdbcType=DECIMAL}, #{splitcode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
  84 + #{isdelete,jdbcType=BIT}, #{uldtype,jdbcType=VARCHAR}, #{uldno,jdbcType=VARCHAR},
57 #{planeno,jdbcType=VARCHAR}, #{opeuserid,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR} 85 #{planeno,jdbcType=VARCHAR}, #{opeuserid,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}
58 ) 86 )
59 </insert> 87 </insert>
@@ -280,4 +308,4 @@ @@ -280,4 +308,4 @@
280 ext5 = #{ext5,jdbcType=VARCHAR} 308 ext5 = #{ext5,jdbcType=VARCHAR}
281 where uuid = #{uuid,jdbcType=VARCHAR} 309 where uuid = #{uuid,jdbcType=VARCHAR}
282 </update> 310 </update>
283 -</mapper>  
  311 +</mapper>