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

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <groupId>com.sunyo.wlpt</groupId>
     <artifactId>base</artifactId>
-    <version>1.03-SNAPSHOT</version>
+    <version>1.05-SNAPSHOT</version>
 
     <name>wlpt-base</name>
     <description>物流平台基础实体包</description>

@@ -11,7 +11,9 @@ public interface AWB_AWBINFOMapper {
 
     AWB_AWBINFO selectByPrimaryKey(String billid);
 
+    int hasWaybill(AWB_AWBINFO record);
+
     int updateByPrimaryKeySelective(AWB_AWBINFO record);
 
     int updateByPrimaryKey(AWB_AWBINFO record);
-}
\ No newline at end of file
+}

@@ -11,6 +11,8 @@ public interface NMMS_CUSTOM_MT1201Mapper {
 
     NMMS_CUSTOM_MT1201 selectByPrimaryKey(String uuid);
 
+    int hasWaybill(NMMS_CUSTOM_MT1201 record);
+
     int updateByPrimaryKeySelective(NMMS_CUSTOM_MT1201 record);
 
     int updateByPrimaryKey(NMMS_CUSTOM_MT1201 record);

 package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sunyo.wlpt.base.model.exception.NMMSException;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -1313,4 +1314,22 @@ public class AWB_AWBINFO {
     public void setCnscomidno(String cnscomidno) {
         this.cnscomidno = cnscomidno;
     }
+
+    /**
+     * 根据原始舱单主单号,set  stockpre and stockno
+     * 主单通过 "-" 符号进行拆分
+     * "-"号前的为stockpre
+     * "-"号后面的为 stockno
+     * @param mt1201 原始舱单
+     * @throws  NMMSException 的awba 为空 或者 长度>3 不够位数 或者不包含"-"符号会抛出 AWBAFORMAT  自定义异常
+     */
+    public void setStockWithMT1201_AWBA(NMMS_CUSTOM_MT1201 mt1201) throws NMMSException{
+        if (mt1201.getAwba() != null && mt1201.getAwba().contains("-") && mt1201.getAwba().length()>4) {
+            String[] awb = mt1201.getAwba().split("-");
+            this.stockpre = awb[0];
+            this.stockno = awb[1];
+        }else {
+            throw new NMMSException("错误的主运单格式:"+mt1201.getAwba());
+        }
+    }
 }

 package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sunyo.wlpt.base.model.exception.NMMSException;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -70,4 +71,17 @@ public class NMMS_CUSTOM_MT1201 {
 
     private String customtype;
 
+    /**
+     * 格式化主运单号,插入 "-" 符号,有 "-" 符号则不更改格式
+     */
+    public void formatAwba() {
+        String spacialCode = "-";
+        if (awba!=null && awba.length()>3 && !awba.contains(spacialCode)){
+            StringBuffer stringBuffer = new StringBuffer(awba);
+            stringBuffer.insert(3, "-");
+            this.awba = stringBuffer.toString().trim();
+        }else {
+            //throw new NMMSException("错误的主运单号,不能为空或者长度未大于4:"+awba);
+        }
+    }
 }

@@ -250,4 +250,58 @@ public class NMMS_CUSTOM_MT520X {
     public void setExt5(String ext5) {
         this.ext5 = ext5 == null ? null : ext5.trim();
     }
+
+    public String getCarrierno() {
+        return carrierno;
+    }
+
+    public void setCarrierno(String carrierno) {
+        this.carrierno = carrierno;
+    }
+
+    public String getSegment() {
+        return segment;
+    }
+
+    public void setSegment(String segment) {
+        this.segment = segment;
+    }
+
+    public String getWaybill() {
+        return waybill;
+    }
+
+    public void setWaybill(String waybill) {
+        this.waybill = waybill;
+    }
+
+    public String getCustomText() {
+        return customText;
+    }
+
+    public void setCustomText(String customText) {
+        this.customText = customText;
+    }
+
+    public AWB_AWBINFO getAwbinfo() {
+        return awbinfo;
+    }
+
+    public void setAwbinfo(AWB_AWBINFO awbinfo) {
+        this.awbinfo = awbinfo;
+    }
+
+    public List<NMMS_CUSTOM_MT520X> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<NMMS_CUSTOM_MT520X> children) {
+        this.children = children;
+    }
+
+
+    @Override
+    public String toString(){
+        return "Mt520x class";
+    }
 }

+package com.sunyo.wlpt.base.model.exception;
+
+public class NMMSException extends RuntimeException{
+
+    public NMMSException(String message) {
+        super(message);
+    }
+
+    public NMMSException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

@@ -128,116 +128,131 @@
     <result column="OPTIME" property="optime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    BILLID, STOCKTYPEID, STOCKPRE, STOCKNO, PRODUCTID, CARRIERPRODUCTID, DELFLAG, PREVIOUSBILLID, 
-    DOMINT, CUSTOMCTL, SPECOPEID, SPECOPEIDEXT, SAIRPORTID, SCITYID, EAIRPORTID, ECITYID, 
-    BY1, DEST1, DEST1CITY, BY2, DEST2, DEST2CITY, BY3, DEST3, DEST3CITY, BY4, DEST4, 
-    DEST4CITY, CARGONO, CARGONM, PACK, MEAS, PCS, WEIGHT, FEEWT, VOL, CTRLOPEDEPARTMENT, 
-    SHPRNAME, SHPRMOBILETYPE, SHPRTEL, SHPRADDRESS, SHPRCOUNTYR, SHPCOMID, SHPAEOCODE, 
-    SHPCUSTOMERID, CNSNNAME, CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS, CNSCOUNTYR, CNSCOMID, 
-    CNSAEOCODE, CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID, COLLECTED, EXCHAGERATE, COMAT, 
-    REFRIGERATED, FORKNUM, WHSHOLD, EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS, SHORTTRANSBUP, 
-    CARGOOWNER, CHARGETIME, ISINSTRUCTION, NOTIFY, SHIPPERVALUE, TRAFFICVALUE, CUSTOMVALUE, 
-    INSUREVALUE, FILEATTACHED, RATETYPE, PROCESSINGMETHOD, HANDLINGCIRCS, RESERVEDTONNAGE, 
-    CARRIAGE, RATE, CRTOPER, WTUNIT, ORIGINALWT, ORIGINALFEEWT, VOLUNIT, CURRENCYID, 
-    ORIGINALVOL, CRTOPETIME, DLVPRIORITY, CHKED, LABELNUM, SHPCUSTOMER, CRTAGENT, CRTDATE, 
-    EXTRAWEIGHT, STOREREMARK, BALANCEREMARK, FILECHKED, ISCARBALANCE, CNSNIDCARD, CIQCHECK, 
-    TMPBILLNO, SUBBILLID, ISTRANS, SPLITTAG, CUSTOMSTRANS, ENDOPER, ENDOPETIME, CONFIRMOPER, 
-    CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID, CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK, 
+    BILLID, STOCKTYPEID, STOCKPRE, STOCKNO, PRODUCTID, CARRIERPRODUCTID, DELFLAG, PREVIOUSBILLID,
+    DOMINT, CUSTOMCTL, SPECOPEID, SPECOPEIDEXT, SAIRPORTID, SCITYID, EAIRPORTID, ECITYID,
+    BY1, DEST1, DEST1CITY, BY2, DEST2, DEST2CITY, BY3, DEST3, DEST3CITY, BY4, DEST4,
+    DEST4CITY, CARGONO, CARGONM, PACK, MEAS, PCS, WEIGHT, FEEWT, VOL, CTRLOPEDEPARTMENT,
+    SHPRNAME, SHPRMOBILETYPE, SHPRTEL, SHPRADDRESS, SHPRCOUNTYR, SHPCOMID, SHPAEOCODE,
+    SHPCUSTOMERID, CNSNNAME, CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS, CNSCOUNTYR, CNSCOMID,
+    CNSAEOCODE, CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID, COLLECTED, EXCHAGERATE, COMAT,
+    REFRIGERATED, FORKNUM, WHSHOLD, EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS, SHORTTRANSBUP,
+    CARGOOWNER, CHARGETIME, ISINSTRUCTION, NOTIFY, SHIPPERVALUE, TRAFFICVALUE, CUSTOMVALUE,
+    INSUREVALUE, FILEATTACHED, RATETYPE, PROCESSINGMETHOD, HANDLINGCIRCS, RESERVEDTONNAGE,
+    CARRIAGE, RATE, CRTOPER, WTUNIT, ORIGINALWT, ORIGINALFEEWT, VOLUNIT, CURRENCYID,
+    ORIGINALVOL, CRTOPETIME, DLVPRIORITY, CHKED, LABELNUM, SHPCUSTOMER, CRTAGENT, CRTDATE,
+    EXTRAWEIGHT, STOREREMARK, BALANCEREMARK, FILECHKED, ISCARBALANCE, CNSNIDCARD, CIQCHECK,
+    TMPBILLNO, SUBBILLID, ISTRANS, SPLITTAG, CUSTOMSTRANS, ENDOPER, ENDOPETIME, CONFIRMOPER,
+    CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID, CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK,
     CARGOSOURCE, CARGONMCH, ISDGR, PERCENT, AWBTYPE, STATUS, PAYMODEL, ISDELETE, OPTIME
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from T_FIL_AWBINFO
     where BILLID = #{billid,jdbcType=VARCHAR}
   </select>
+  <select id="hasWaybill" resultType="java.lang.Integer" parameterType="com.sunyo.wlpt.base.model.AWB_AWBINFO" >
+    select count(*)
+    from T_FIL_AWBINFO
+    <where>
+      <if test="stockpre != null" >
+        AND STOCKPRE = #{stockpre,jdbcType=VARCHAR}
+      </if>
+      <if test="stockno != null" >
+        AND STOCKNO = #{stockno,jdbcType=VARCHAR}
+      </if>
+      <if test="stocktypeid != null" >
+        AND STOCKTYPEID = #{stocktypeid,jdbcType=VARCHAR}
+      </if>
+    </where>
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from T_FIL_AWBINFO
     where BILLID = #{billid,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.sunyo.wlpt.base.model.AWB_AWBINFO" >
-    insert into T_FIL_AWBINFO (BILLID, STOCKTYPEID, STOCKPRE, 
-      STOCKNO, PRODUCTID, CARRIERPRODUCTID, 
-      DELFLAG, PREVIOUSBILLID, DOMINT, 
-      CUSTOMCTL, SPECOPEID, SPECOPEIDEXT, 
-      SAIRPORTID, SCITYID, EAIRPORTID, 
-      ECITYID, BY1, DEST1, 
-      DEST1CITY, BY2, DEST2, 
-      DEST2CITY, BY3, DEST3, 
-      DEST3CITY, BY4, DEST4, 
-      DEST4CITY, CARGONO, CARGONM, 
-      PACK, MEAS, PCS, WEIGHT, 
-      FEEWT, VOL, CTRLOPEDEPARTMENT, 
-      SHPRNAME, SHPRMOBILETYPE, SHPRTEL, 
-      SHPRADDRESS, SHPRCOUNTYR, SHPCOMID, 
-      SHPAEOCODE, SHPCUSTOMERID, CNSNNAME, 
-      CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS, 
-      CNSCOUNTYR, CNSCOMID, CNSAEOCODE, 
-      CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID, 
-      COLLECTED, EXCHAGERATE, COMAT, 
-      REFRIGERATED, FORKNUM, WHSHOLD, 
-      EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS, 
-      SHORTTRANSBUP, CARGOOWNER, CHARGETIME, 
-      ISINSTRUCTION, NOTIFY, SHIPPERVALUE, 
-      TRAFFICVALUE, CUSTOMVALUE, INSUREVALUE, 
-      FILEATTACHED, RATETYPE, PROCESSINGMETHOD, 
-      HANDLINGCIRCS, RESERVEDTONNAGE, CARRIAGE, 
-      RATE, CRTOPER, WTUNIT, 
-      ORIGINALWT, ORIGINALFEEWT, VOLUNIT, 
-      CURRENCYID, ORIGINALVOL, CRTOPETIME, 
-      DLVPRIORITY, CHKED, LABELNUM, 
-      SHPCUSTOMER, CRTAGENT, CRTDATE, 
-      EXTRAWEIGHT, STOREREMARK, BALANCEREMARK, 
-      FILECHKED, ISCARBALANCE, CNSNIDCARD, 
-      CIQCHECK, TMPBILLNO, SUBBILLID, 
-      ISTRANS, SPLITTAG, CUSTOMSTRANS, 
-      ENDOPER, ENDOPETIME, CONFIRMOPER, 
-      CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID, 
-      CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK, 
-      CARGOSOURCE, CARGONMCH, ISDGR, 
-      PERCENT, AWBTYPE, STATUS, 
+    insert into T_FIL_AWBINFO (BILLID, STOCKTYPEID, STOCKPRE,
+      STOCKNO, PRODUCTID, CARRIERPRODUCTID,
+      DELFLAG, PREVIOUSBILLID, DOMINT,
+      CUSTOMCTL, SPECOPEID, SPECOPEIDEXT,
+      SAIRPORTID, SCITYID, EAIRPORTID,
+      ECITYID, BY1, DEST1,
+      DEST1CITY, BY2, DEST2,
+      DEST2CITY, BY3, DEST3,
+      DEST3CITY, BY4, DEST4,
+      DEST4CITY, CARGONO, CARGONM,
+      PACK, MEAS, PCS, WEIGHT,
+      FEEWT, VOL, CTRLOPEDEPARTMENT,
+      SHPRNAME, SHPRMOBILETYPE, SHPRTEL,
+      SHPRADDRESS, SHPRCOUNTYR, SHPCOMID,
+      SHPAEOCODE, SHPCUSTOMERID, CNSNNAME,
+      CNSRMOBILETYPE, CNSNTEL, CNSNADDRESS,
+      CNSCOUNTYR, CNSCOMID, CNSAEOCODE,
+      CNSRCTCNAME, CNSRCTCTEL, CSGCUSTOMERID,
+      COLLECTED, EXCHAGERATE, COMAT,
+      REFRIGERATED, FORKNUM, WHSHOLD,
+      EXPCUSTTRANSIT, IMPCUSTTRANSIT, SHORTTRANS,
+      SHORTTRANSBUP, CARGOOWNER, CHARGETIME,
+      ISINSTRUCTION, NOTIFY, SHIPPERVALUE,
+      TRAFFICVALUE, CUSTOMVALUE, INSUREVALUE,
+      FILEATTACHED, RATETYPE, PROCESSINGMETHOD,
+      HANDLINGCIRCS, RESERVEDTONNAGE, CARRIAGE,
+      RATE, CRTOPER, WTUNIT,
+      ORIGINALWT, ORIGINALFEEWT, VOLUNIT,
+      CURRENCYID, ORIGINALVOL, CRTOPETIME,
+      DLVPRIORITY, CHKED, LABELNUM,
+      SHPCUSTOMER, CRTAGENT, CRTDATE,
+      EXTRAWEIGHT, STOREREMARK, BALANCEREMARK,
+      FILECHKED, ISCARBALANCE, CNSNIDCARD,
+      CIQCHECK, TMPBILLNO, SUBBILLID,
+      ISTRANS, SPLITTAG, CUSTOMSTRANS,
+      ENDOPER, ENDOPETIME, CONFIRMOPER,
+      CONFIRMOPETIME, CSGCUSTOMER, RELATIONBILLID,
+      CUSTOMS_COUNTRY, CUSTOMS_CITY, CUSTOMS_REMARK,
+      CARGOSOURCE, CARGONMCH, ISDGR,
+      PERCENT, AWBTYPE, STATUS,
       PAYMODEL, ISDELETE, OPTIME
       )
-    values (#{billid,jdbcType=VARCHAR}, #{stocktypeid,jdbcType=VARCHAR}, #{stockpre,jdbcType=VARCHAR}, 
-      #{stockno,jdbcType=VARCHAR}, #{productid,jdbcType=VARCHAR}, #{carrierproductid,jdbcType=VARCHAR}, 
-      #{delflag,jdbcType=VARCHAR}, #{previousbillid,jdbcType=VARCHAR}, #{domint,jdbcType=VARCHAR}, 
-      #{customctl,jdbcType=VARCHAR}, #{specopeid,jdbcType=VARCHAR}, #{specopeidext,jdbcType=VARCHAR}, 
-      #{sairportid,jdbcType=VARCHAR}, #{scityid,jdbcType=VARCHAR}, #{eairportid,jdbcType=VARCHAR}, 
-      #{ecityid,jdbcType=VARCHAR}, #{by1,jdbcType=VARCHAR}, #{dest1,jdbcType=VARCHAR}, 
-      #{dest1city,jdbcType=VARCHAR}, #{by2,jdbcType=VARCHAR}, #{dest2,jdbcType=VARCHAR}, 
-      #{dest2city,jdbcType=VARCHAR}, #{by3,jdbcType=VARCHAR}, #{dest3,jdbcType=VARCHAR}, 
-      #{dest3city,jdbcType=VARCHAR}, #{by4,jdbcType=VARCHAR}, #{dest4,jdbcType=VARCHAR}, 
-      #{dest4city,jdbcType=VARCHAR}, #{cargono,jdbcType=VARCHAR}, #{cargonm,jdbcType=VARCHAR}, 
-      #{pack,jdbcType=VARCHAR}, #{meas,jdbcType=VARCHAR}, #{pcs,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL}, 
-      #{feewt,jdbcType=DECIMAL}, #{vol,jdbcType=DECIMAL}, #{ctrlopedepartment,jdbcType=VARCHAR}, 
-      #{shprname,jdbcType=VARCHAR}, #{shprmobiletype,jdbcType=VARCHAR}, #{shprtel,jdbcType=VARCHAR}, 
-      #{shpraddress,jdbcType=VARCHAR}, #{shprcountyr,jdbcType=VARCHAR}, #{shpcomid,jdbcType=VARCHAR}, 
-      #{shpaeocode,jdbcType=VARCHAR}, #{shpcustomerid,jdbcType=VARCHAR}, #{cnsnname,jdbcType=VARCHAR}, 
-      #{cnsrmobiletype,jdbcType=VARCHAR}, #{cnsntel,jdbcType=VARCHAR}, #{cnsnaddress,jdbcType=VARCHAR}, 
-      #{cnscountyr,jdbcType=VARCHAR}, #{cnscomid,jdbcType=VARCHAR}, #{cnsaeocode,jdbcType=VARCHAR}, 
-      #{cnsrctcname,jdbcType=VARCHAR}, #{cnsrctctel,jdbcType=VARCHAR}, #{csgcustomerid,jdbcType=VARCHAR}, 
-      #{collected,jdbcType=VARCHAR}, #{exchagerate,jdbcType=DECIMAL}, #{comat,jdbcType=VARCHAR}, 
-      #{refrigerated,jdbcType=VARCHAR}, #{forknum,jdbcType=DECIMAL}, #{whshold,jdbcType=VARCHAR}, 
-      #{expcusttransit,jdbcType=VARCHAR}, #{impcusttransit,jdbcType=VARCHAR}, #{shorttrans,jdbcType=VARCHAR}, 
-      #{shorttransbup,jdbcType=VARCHAR}, #{cargoowner,jdbcType=VARCHAR}, #{chargetime,jdbcType=TIMESTAMP}, 
-      #{isinstruction,jdbcType=VARCHAR}, #{notify,jdbcType=VARCHAR}, #{shippervalue,jdbcType=DECIMAL}, 
-      #{trafficvalue,jdbcType=DECIMAL}, #{customvalue,jdbcType=DECIMAL}, #{insurevalue,jdbcType=DECIMAL}, 
-      #{fileattached,jdbcType=VARCHAR}, #{ratetype,jdbcType=VARCHAR}, #{processingmethod,jdbcType=VARCHAR}, 
-      #{handlingcircs,jdbcType=VARCHAR}, #{reservedtonnage,jdbcType=VARCHAR}, #{carriage,jdbcType=DECIMAL}, 
-      #{rate,jdbcType=DECIMAL}, #{crtoper,jdbcType=VARCHAR}, #{wtunit,jdbcType=VARCHAR}, 
-      #{originalwt,jdbcType=DECIMAL}, #{originalfeewt,jdbcType=DECIMAL}, #{volunit,jdbcType=VARCHAR}, 
-      #{currencyid,jdbcType=VARCHAR}, #{originalvol,jdbcType=DECIMAL}, #{crtopetime,jdbcType=TIMESTAMP}, 
-      #{dlvpriority,jdbcType=CHAR}, #{chked,jdbcType=VARCHAR}, #{labelnum,jdbcType=DECIMAL}, 
-      #{shpcustomer,jdbcType=VARCHAR}, #{crtagent,jdbcType=VARCHAR}, #{crtdate,jdbcType=TIMESTAMP}, 
-      #{extraweight,jdbcType=DECIMAL}, #{storeremark,jdbcType=VARCHAR}, #{balanceremark,jdbcType=VARCHAR}, 
-      #{filechked,jdbcType=VARCHAR}, #{iscarbalance,jdbcType=VARCHAR}, #{cnsnidcard,jdbcType=VARCHAR}, 
-      #{ciqcheck,jdbcType=CHAR}, #{tmpbillno,jdbcType=VARCHAR}, #{subbillid,jdbcType=VARCHAR}, 
-      #{istrans,jdbcType=VARCHAR}, #{splittag,jdbcType=CHAR}, #{customstrans,jdbcType=CHAR}, 
-      #{endoper,jdbcType=VARCHAR}, #{endopetime,jdbcType=TIMESTAMP}, #{confirmoper,jdbcType=VARCHAR}, 
-      #{confirmopetime,jdbcType=TIMESTAMP}, #{csgcustomer,jdbcType=VARCHAR}, #{relationbillid,jdbcType=VARCHAR}, 
-      #{customsCountry,jdbcType=VARCHAR}, #{customsCity,jdbcType=VARCHAR}, #{customsRemark,jdbcType=VARCHAR}, 
-      #{cargosource,jdbcType=VARCHAR}, #{cargonmch,jdbcType=VARCHAR}, #{isdgr,jdbcType=VARCHAR}, 
-      #{percent,jdbcType=DECIMAL}, #{awbtype,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
+    values (#{billid,jdbcType=VARCHAR}, #{stocktypeid,jdbcType=VARCHAR}, #{stockpre,jdbcType=VARCHAR},
+      #{stockno,jdbcType=VARCHAR}, #{productid,jdbcType=VARCHAR}, #{carrierproductid,jdbcType=VARCHAR},
+      #{delflag,jdbcType=VARCHAR}, #{previousbillid,jdbcType=VARCHAR}, #{domint,jdbcType=VARCHAR},
+      #{customctl,jdbcType=VARCHAR}, #{specopeid,jdbcType=VARCHAR}, #{specopeidext,jdbcType=VARCHAR},
+      #{sairportid,jdbcType=VARCHAR}, #{scityid,jdbcType=VARCHAR}, #{eairportid,jdbcType=VARCHAR},
+      #{ecityid,jdbcType=VARCHAR}, #{by1,jdbcType=VARCHAR}, #{dest1,jdbcType=VARCHAR},
+      #{dest1city,jdbcType=VARCHAR}, #{by2,jdbcType=VARCHAR}, #{dest2,jdbcType=VARCHAR},
+      #{dest2city,jdbcType=VARCHAR}, #{by3,jdbcType=VARCHAR}, #{dest3,jdbcType=VARCHAR},
+      #{dest3city,jdbcType=VARCHAR}, #{by4,jdbcType=VARCHAR}, #{dest4,jdbcType=VARCHAR},
+      #{dest4city,jdbcType=VARCHAR}, #{cargono,jdbcType=VARCHAR}, #{cargonm,jdbcType=VARCHAR},
+      #{pack,jdbcType=VARCHAR}, #{meas,jdbcType=VARCHAR}, #{pcs,jdbcType=DECIMAL}, #{weight,jdbcType=DECIMAL},
+      #{feewt,jdbcType=DECIMAL}, #{vol,jdbcType=DECIMAL}, #{ctrlopedepartment,jdbcType=VARCHAR},
+      #{shprname,jdbcType=VARCHAR}, #{shprmobiletype,jdbcType=VARCHAR}, #{shprtel,jdbcType=VARCHAR},
+      #{shpraddress,jdbcType=VARCHAR}, #{shprcountyr,jdbcType=VARCHAR}, #{shpcomid,jdbcType=VARCHAR},
+      #{shpaeocode,jdbcType=VARCHAR}, #{shpcustomerid,jdbcType=VARCHAR}, #{cnsnname,jdbcType=VARCHAR},
+      #{cnsrmobiletype,jdbcType=VARCHAR}, #{cnsntel,jdbcType=VARCHAR}, #{cnsnaddress,jdbcType=VARCHAR},
+      #{cnscountyr,jdbcType=VARCHAR}, #{cnscomid,jdbcType=VARCHAR}, #{cnsaeocode,jdbcType=VARCHAR},
+      #{cnsrctcname,jdbcType=VARCHAR}, #{cnsrctctel,jdbcType=VARCHAR}, #{csgcustomerid,jdbcType=VARCHAR},
+      #{collected,jdbcType=VARCHAR}, #{exchagerate,jdbcType=DECIMAL}, #{comat,jdbcType=VARCHAR},
+      #{refrigerated,jdbcType=VARCHAR}, #{forknum,jdbcType=DECIMAL}, #{whshold,jdbcType=VARCHAR},
+      #{expcusttransit,jdbcType=VARCHAR}, #{impcusttransit,jdbcType=VARCHAR}, #{shorttrans,jdbcType=VARCHAR},
+      #{shorttransbup,jdbcType=VARCHAR}, #{cargoowner,jdbcType=VARCHAR}, #{chargetime,jdbcType=TIMESTAMP},
+      #{isinstruction,jdbcType=VARCHAR}, #{notify,jdbcType=VARCHAR}, #{shippervalue,jdbcType=DECIMAL},
+      #{trafficvalue,jdbcType=DECIMAL}, #{customvalue,jdbcType=DECIMAL}, #{insurevalue,jdbcType=DECIMAL},
+      #{fileattached,jdbcType=VARCHAR}, #{ratetype,jdbcType=VARCHAR}, #{processingmethod,jdbcType=VARCHAR},
+      #{handlingcircs,jdbcType=VARCHAR}, #{reservedtonnage,jdbcType=VARCHAR}, #{carriage,jdbcType=DECIMAL},
+      #{rate,jdbcType=DECIMAL}, #{crtoper,jdbcType=VARCHAR}, #{wtunit,jdbcType=VARCHAR},
+      #{originalwt,jdbcType=DECIMAL}, #{originalfeewt,jdbcType=DECIMAL}, #{volunit,jdbcType=VARCHAR},
+      #{currencyid,jdbcType=VARCHAR}, #{originalvol,jdbcType=DECIMAL}, #{crtopetime,jdbcType=TIMESTAMP},
+      #{dlvpriority,jdbcType=CHAR}, #{chked,jdbcType=VARCHAR}, #{labelnum,jdbcType=DECIMAL},
+      #{shpcustomer,jdbcType=VARCHAR}, #{crtagent,jdbcType=VARCHAR}, #{crtdate,jdbcType=TIMESTAMP},
+      #{extraweight,jdbcType=DECIMAL}, #{storeremark,jdbcType=VARCHAR}, #{balanceremark,jdbcType=VARCHAR},
+      #{filechked,jdbcType=VARCHAR}, #{iscarbalance,jdbcType=VARCHAR}, #{cnsnidcard,jdbcType=VARCHAR},
+      #{ciqcheck,jdbcType=CHAR}, #{tmpbillno,jdbcType=VARCHAR}, #{subbillid,jdbcType=VARCHAR},
+      #{istrans,jdbcType=VARCHAR}, #{splittag,jdbcType=CHAR}, #{customstrans,jdbcType=CHAR},
+      #{endoper,jdbcType=VARCHAR}, #{endopetime,jdbcType=TIMESTAMP}, #{confirmoper,jdbcType=VARCHAR},
+      #{confirmopetime,jdbcType=TIMESTAMP}, #{csgcustomer,jdbcType=VARCHAR}, #{relationbillid,jdbcType=VARCHAR},
+      #{customsCountry,jdbcType=VARCHAR}, #{customsCity,jdbcType=VARCHAR}, #{customsRemark,jdbcType=VARCHAR},
+      #{cargosource,jdbcType=VARCHAR}, #{cargonmch,jdbcType=VARCHAR}, #{isdgr,jdbcType=VARCHAR},
+      #{percent,jdbcType=DECIMAL}, #{awbtype,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
       #{paymodel,jdbcType=VARCHAR}, #{isdelete,jdbcType=BIT}, #{optime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -1494,4 +1509,4 @@
       OPTIME = #{optime,jdbcType=TIMESTAMP}
     where BILLID = #{billid,jdbcType=VARCHAR}
   </update>
-</mapper>
\ No newline at end of file
+</mapper>

@@ -25,35 +25,63 @@
     <result column="ext5" property="ext5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    uuid, awba, awbh, customCode, goodsName, acTime, carrier, flightNo, flightDate, originStation, 
-    destinationStation, piece, weight, splitCode, status, isDelete, uldType, uldNo, planeNo, 
+    uuid, awba, awbh, customCode, goodsName, acTime, carrier, flightNo, flightDate, originStation,
+    destinationStation, piece, weight, splitCode, status, isDelete, uldType, uldNo, planeNo,
     opeuserid, ext5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from CUSTOM_MT1201
     where uuid = #{uuid,jdbcType=VARCHAR}
   </select>
+  <select id="hasWaybill" resultType="java.lang.Integer" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201" >
+    select count(*) from (
+      select
+      count(uuid) as counts
+      from CUSTOM_MT1201
+      <where>
+        <if test="flightdate !=null">
+        AND flightDate = #{flightdate,jdbcType=DATE}
+        </if>
+       <if test="carrier!=null">
+         AND carrier = #{carrier,jdbcType=VARCHAR}
+       </if>
+       <if test="flightno!=null">
+         AND flightNo = #{flightno,jdbcType=VARCHAR}
+       </if>
+       <if test="awba!=null and awba != ''">
+         AND awba=#{awba,jdbcType=VARCHAR}
+       </if>
+       <if test="awbh!=null">
+         AND awbh=#{awbh,jdbcType=VARCHAR}
+       </if>
+     </where>
+      union
+      select count(uuid) as counts
+      from CUSTOM_MT1201
+      where uuid = #{uuid,jdbcType=VARCHAR}
+    ) t where counts>0
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from CUSTOM_MT1201
     where uuid = #{uuid,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201" >
-    insert into CUSTOM_MT1201 (uuid, awba, awbh, 
-      customCode, goodsName, acTime, 
-      carrier, flightNo, flightDate, 
-      originStation, destinationStation, piece, 
-      weight, splitCode, status, 
-      isDelete, uldType, uldNo, 
+    insert into CUSTOM_MT1201 (uuid, awba, awbh,
+      customCode, goodsName, acTime,
+      carrier, flightNo, flightDate,
+      originStation, destinationStation, piece,
+      weight, splitCode, status,
+      isDelete, uldType, uldNo,
       planeNo, opeuserid, ext5
       )
-    values (#{uuid,jdbcType=VARCHAR}, #{awba,jdbcType=VARCHAR}, #{awbh,jdbcType=VARCHAR}, 
-      #{customcode,jdbcType=VARCHAR}, #{goodsname,jdbcType=VARCHAR}, #{actime,jdbcType=TIMESTAMP}, 
-      #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE}, 
-      #{originstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, #{piece,jdbcType=INTEGER}, 
-      #{weight,jdbcType=DECIMAL}, #{splitcode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
-      #{isdelete,jdbcType=BIT}, #{uldtype,jdbcType=VARCHAR}, #{uldno,jdbcType=VARCHAR}, 
+    values (#{uuid,jdbcType=VARCHAR}, #{awba,jdbcType=VARCHAR}, #{awbh,jdbcType=VARCHAR},
+      #{customcode,jdbcType=VARCHAR}, #{goodsname,jdbcType=VARCHAR}, #{actime,jdbcType=TIMESTAMP},
+      #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=DATE},
+      #{originstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, #{piece,jdbcType=INTEGER},
+      #{weight,jdbcType=DECIMAL}, #{splitcode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+      #{isdelete,jdbcType=BIT}, #{uldtype,jdbcType=VARCHAR}, #{uldno,jdbcType=VARCHAR},
       #{planeno,jdbcType=VARCHAR}, #{opeuserid,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}
       )
   </insert>
@@ -280,4 +308,4 @@
       ext5 = #{ext5,jdbcType=VARCHAR}
     where uuid = #{uuid,jdbcType=VARCHAR}
   </update>
-</mapper>
\ No newline at end of file
+</mapper>