大部分回执解析 部分完善 海关表更新

@@ -8,4 +8,6 @@ public interface CUSTOMSMESSAGEMapper {
     int insertSelective(CUSTOMSMESSAGEWithBLOBs record);
 
     CUSTOMSMESSAGEWithBLOBs selectMessage(String messageId);
+
+    int updateMessage(CUSTOMSMESSAGEWithBLOBs record);
 }
\ No newline at end of file

@@ -95,14 +95,23 @@ public class CustomXmlHandle{
         //要解析的回执类型
         String type= "MT9999";
 
+        String flightNo = "";
+        String flightDate = "";
+
         //开始解析
 //        fzeFoh.setGrossweightmeasureuc(XMLXPath.getSingleValueByPath(document,GrossWeightMeasureUc));
         String msgType = XMLXPath.getSingleValueByPath(document,MessageType);
         String journeyid = XMLXPath.getSingleValueByPath(document,JourneyID);
 //            XMLXPath.getSingleValueByPath(document, )
-        String[] flightList = journeyid.split("/");
-        String flightNo = flightList[0];
-        String flightDate = flightList[1];
+
+        if(journeyid != null){
+
+            String[] flightList = journeyid.split("/");
+
+            flightNo = flightList[0];
+            flightDate = flightList[1];
+        }
+
         String awbA = XMLXPath.getSingleValueByPath(document,waybillMaster);
         //全格式的分单 如 17212345678_ADBD
         String awbH = XMLXPath.getSingleValueByPath(document,waybillSecond);
@@ -113,18 +122,25 @@ public class CustomXmlHandle{
         switch (msgType){
             case "MT9999":
                 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception);
+                break;
             case "MT3201":
                 i= customXmlHandle.arrivedmasterService.insertRecept(customReception);
+                break;
             case "MT5202":
                 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5202");
+                break;
             case "MT5201":
                 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5201");
+                break;
             case "MT4201":
                 i = customXmlHandle.departuresloadingService.insertRecept(customReception);
+                break;
             case "MT1201":
                 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception);
+                break;
             case "MT2201":
                 i = customXmlHandle.preparemasterService.insertRecept(customReception);
+                break;
 
         }
 

@@ -34,6 +34,7 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
     // 货物接收运抵主分单
     public int insertRecept(CustomReception customReception) {
 
+        ShareServiceImp shareServiceImp = new ShareServiceImp();
 
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
@@ -44,7 +45,10 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
         //回执内容
         String reception = customReception.getResponseText();
         String flightDateStr = customReception.getFlightDate();
-        Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        Date flightDate = new Date();
+        if (flightDateStr != null){
+            flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        }
 
         // 设置 接收运抵分单  回执
         ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();
@@ -85,7 +89,8 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
                     log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
                     int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -106,14 +111,15 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
                     log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
                     int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
                 return 0;
             }
         }else {
-            ShareServiceImp shareServiceImp = new ShareServiceImp();
+
             return shareServiceImp.share("MT3201", customReception);
         }
 

@@ -33,12 +33,20 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
     @Override
     public int insertRecept(CustomReception customReception){
 
+        ShareServiceImp shareServiceImp = new ShareServiceImp();
+
+
         String awbA = customReception.getWayBillMaster();
         String awbH = customReception.getWayBillSecond();
         // 回执内容
         String reception = customReception.getResponseText();
         String flightDateStr = customReception.getFlightDate();
-        Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+
+        Date flightDate = new Date();
+        if (flightDateStr != null){
+            flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        }
+
 
         // 设置分单回执
         Originmanifestsecondary originmanifestsecondary = new Originmanifestsecondary();
@@ -79,7 +87,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
                     log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
                     int ii = insertSendlog("MT1201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -100,7 +109,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
                     log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
                     int ii =insertSendlog("MT1201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -108,7 +118,7 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
             }
         }else {
 
-            ShareServiceImp shareServiceImp = new ShareServiceImp();
+
             return shareServiceImp.share("MT1201", customReception);
         }
 

@@ -25,6 +25,9 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
 
     @Override
     public int insertRecept(CustomReception customReception) {
+
+        ShareServiceImp shareServiceImp = new ShareServiceImp();
+
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
 
@@ -34,7 +37,10 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
         //回执内容
         String reception = customReception.getResponseText();
         String flightDateStr = customReception.getFlightDate();
-        Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        Date flightDate = new Date();
+        if (flightDateStr != null){
+            flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        }
 
         //设置主单回执、航班号、航班日期
         DEPARTURESLOADING departuresloading = new DEPARTURESLOADING();
@@ -68,14 +74,15 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
                     log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
                     int ii =coustomAnalysisServiceImp.insertSendlog("MT4201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
                 return 0;
             }
         }else {
-            ShareServiceImp shareServiceImp = new ShareServiceImp();
+
             return shareServiceImp.share("MT4201", customReception);
         }
         //未进入主分单解析 返回0 失败

@@ -32,6 +32,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
     // 货物接收运抵主分单
     public int insertRecept(CustomReception customReception) {
 
+
+        ShareServiceImp shareServiceImp = new ShareServiceImp();
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
 
@@ -41,7 +43,10 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
         //回执内容
         String reception = customReception.getResponseText();
         String flightDateStr = customReception.getFlightDate();
-        Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        Date flightDate = new Date();
+        if (flightDateStr != null){
+            flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        }
 
         // 设置 接收运抵分单  回执
         PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
@@ -83,7 +88,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
                     log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
                     int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -104,7 +110,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
                     log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
                     int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -112,7 +119,7 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
             }
         }else {
 
-            ShareServiceImp shareServiceImp = new ShareServiceImp();
+
             return shareServiceImp.share("MT2201", customReception);
         }
 

@@ -58,8 +58,28 @@ public class ShareServiceImp {
             case "MT9999":
                return MT1201MT9999(customReception, cus, type);
             case "MT3201":
-                // 判断 主单id  主单号是否为空
-                if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){
+                // 判断 分单id  分单号是否为空
+                if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
+                    // 分单
+                    ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();
+
+                    arrivedsecondary.setReceiption(customReception.getResponseText());
+                    arrivedsecondary.setAutoid(cus.getSecondaryautoid());
+                    arrivedsecondary.setWaybillnomaster(cus.getWaybillnomaster());
+                    arrivedsecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
+                    int i = arrivedsecondaryMapper.updateRECEIPTION(arrivedsecondary);
+                    //插入sendlog记录表
+                    log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
+                    int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
+                    // 更新海关表  内容回执
+                    int iii = updateMessage(cus);
+
+                    if (i > 0 && ii > 0 && iii > 0) {
+
+                        return 1;
+                    }
+                }else {
+
                     String waybill = waybill(cus.getWaybillnomaster());
 
                     ARRIVEDMASTER arrivedmaster = new ARRIVEDMASTER();
@@ -74,28 +94,15 @@ public class ShareServiceImp {
                     //插入sendlog记录表
                     log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
                     int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
-                    if (i > 0 && ii > 0){
+                    // 更新海关表  内容回执
+                    int iii = updateMessage(cus);
+
+                    if (i > 0 && ii > 0 && iii > 0) {
 
                         return 1;
                     }
 
                     return 0;
-                }else {
-                    // 分单
-                    ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();
-
-                    arrivedsecondary.setReceiption(customReception.getResponseText());
-                    arrivedsecondary.setAutoid(cus.getSecondaryautoid());
-                    arrivedsecondary.setWaybillnomaster(cus.getWaybillnomaster());
-                    arrivedsecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
-                    int i = arrivedsecondaryMapper.updateRECEIPTION(arrivedsecondary);
-                    //插入sendlog记录表
-                    log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
-                    int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
-                    if (i > 0 && ii > 0){
-
-                        return 1;
-                    }
                 }
             case "MT5202":
 
@@ -117,7 +124,10 @@ public class ShareServiceImp {
                 //插入sendlog记录表
                 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
                 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
-                if (i > 0 && ii > 0){
+                // 更新海关表  内容回执
+                int iii1 = updateMessage(cus);
+
+                if (i > 0 && ii > 0 && iii1 > 0) {
 
                     return 1;
                 }
@@ -125,8 +135,28 @@ public class ShareServiceImp {
 
                 return MT1201MT9999(customReception, cus, type);
             case "MT2201":
-                // 判断 主单id  主单号是否为空
-                if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){
+                // 判断 分单id  分单号是否为空
+                if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
+                    // 分单
+                    PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
+
+                    preparesecondary.setReceiptinformation(customReception.getResponseText());
+                    preparesecondary.setAutoid(cus.getSecondaryautoid());
+                    preparesecondary.setWaybillnomaster(cus.getWaybillnomaster());
+                    preparesecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
+                    int i1 = preparesecondaryMapper.updateRECEIPTION(preparesecondary);
+                    //插入sendlog记录表
+                    log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
+                    int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
+                    // 更新海关表  内容回执
+                    int iii = updateMessage(cus);
+
+                    if (i1 > 0 && ii1 > 0 && iii > 0) {
+
+                        return 1;
+                    }
+                }else {
+
                     String waybill1 = waybill(cus.getWaybillnomaster());
 
                     PREPAREMASTER preparemaster = new PREPAREMASTER();
@@ -141,35 +171,21 @@ public class ShareServiceImp {
                     //插入sendlog记录表
                     log.info("即将插入日志运单号为:"+waybill1+"->autoid="+cus.getMasterautoid());
                     int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
-                    if (i1 > 0 && ii1 > 0){
+                    // 更新海关表  内容回执
+                    int iii = updateMessage(cus);
+
+                    if (i1 > 0 && ii1 > 0 && iii > 0) {
 
                         return 1;
                     }
 
                     return 0;
-                }else {
-                    // 分单
-                    PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
-
-                    preparesecondary.setReceiptinformation(customReception.getResponseText());
-                    preparesecondary.setAutoid(cus.getSecondaryautoid());
-                    preparesecondary.setWaybillnomaster(cus.getWaybillnomaster());
-                    preparesecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
-                    int i1 = preparesecondaryMapper.updateRECEIPTION(preparesecondary);
-                    //插入sendlog记录表
-                    log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
-                    int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
-                    if (i1 > 0 && ii1 > 0){
-
-                        return 1;
-                    }
                 }
         }
-
-
         return 0;
     }
 
+
     public String waybill (String waybill){
 
         StringBuffer stringBuffer = new StringBuffer(waybill);
@@ -183,8 +199,30 @@ public class ShareServiceImp {
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
 
-        // 判断 主单id  主单号是否为空
-        if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){
+        // 判断 分单id  分单号是否为空
+        if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
+            // 分单
+            TALLYSECONDARY tallysecondary = new TALLYSECONDARY();
+
+            tallysecondary.setReceiptinformation(customReception.getResponseText());
+            tallysecondary.setAutoid(cus.getSecondaryautoid());
+            tallysecondary.setWaybillnomaster(cus.getWaybillnomaster());
+            tallysecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
+            int i = tallysecondaryMapper.updateRECEIPTION(tallysecondary);
+            //插入sendlog记录表
+            log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
+            int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
+            // 更新海关表  内容回执
+            int iii = updateMessage(cus);
+
+            if (i > 0 && ii > 0 && iii > 0) {
+
+                return 1;
+            }
+
+            return 0;
+        }else {
+
             String waybill = waybill(cus.getWaybillnomaster());
 
             TALLYMASTER tallymaster = new TALLYMASTER();
@@ -199,25 +237,10 @@ public class ShareServiceImp {
             //插入sendlog记录表
             log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
             int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
-            if (i > 0 && ii > 0){
+            // 更新海关表  内容回执
+            int iii = updateMessage(cus);
 
-                return 1;
-            }
-
-            return 0;
-        }else {
-            // 分单
-            TALLYSECONDARY tallysecondary = new TALLYSECONDARY();
-
-            tallysecondary.setReceiptinformation(customReception.getResponseText());
-            tallysecondary.setAutoid(cus.getSecondaryautoid());
-            tallysecondary.setWaybillnomaster(cus.getWaybillnomaster());
-            tallysecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
-            int i = tallysecondaryMapper.updateRECEIPTION(tallysecondary);
-            //插入sendlog记录表
-            log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
-            int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
-            if (i > 0 && ii > 0){
+            if (i > 0 && ii > 0 && iii > 0) {
 
                 return 1;
             }
@@ -231,8 +254,30 @@ public class ShareServiceImp {
     public int MT1201MT9999(CustomReception customReception, CUSTOMSMESSAGEWithBLOBs cus, String type) {
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
-        // 判断 主单id  主单号是否为空
-        if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null) {
+        // 判断 分单id  分单号是否为空
+        if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
+            // 分单
+            Originmanifestsecondary or = new Originmanifestsecondary();
+
+            or.setReceiption(customReception.getResponseText());
+            or.setAutoid(cus.getSecondaryautoid());
+            or.setWaybillnomaster(cus.getWaybillnomaster());
+            or.setWaybillnosecondary(cus.getWaybillnosecondary());
+            int i = originmanifestsecondaryMapper.updateRECEIPTION(or);
+            //插入sendlog记录表
+            log.info("即将插入日志运单号为:" + cus.getWaybillnosecondary() + "->autoid=" + cus.getSecondaryautoid());
+            int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getSecondaryautoid());
+
+            // 更新海关表  内容回执
+            int iii = updateMessage(cus);
+
+            if (i > 0 && ii > 0 && iii > 0) {
+
+                return 1;
+            }
+            return 0;
+        } else {
+            // 主单
             String waybill = waybill(cus.getWaybillnomaster());
 
             ORIGINMANIFESTMASTER or = new ORIGINMANIFESTMASTER();
@@ -246,29 +291,36 @@ public class ShareServiceImp {
             //插入sendlog记录表
             log.info("即将插入日志运单号为:" + waybill + "->autoid=" + cus.getMasterautoid());
             int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getMasterautoid());
-            if (i > 0 && ii > 0) {
 
-                return 1;
-            }
 
-            return 0;
-        } else {
-            // 分单
-            Originmanifestsecondary or = new Originmanifestsecondary();
+            // 更新海关表  内容回执
+            int iii = updateMessage(cus);
 
-            or.setReceiption(customReception.getResponseText());
-            or.setAutoid(cus.getSecondaryautoid());
-            or.setWaybillnomaster(cus.getWaybillnomaster());
-            or.setWaybillnosecondary(cus.getWaybillnosecondary());
-            int i = originmanifestsecondaryMapper.updateRECEIPTION(or);
-            //插入sendlog记录表
-            log.info("即将插入日志运单号为:" + cus.getWaybillnosecondary() + "->autoid=" + cus.getSecondaryautoid());
-            int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getSecondaryautoid());
-            if (i > 0 && ii > 0) {
+            if (i > 0 && ii > 0 && iii > 0) {
 
                 return 1;
             }
+
             return 0;
         }
     }
+
+
+    // messageId 更新
+    public int updateMessage(CUSTOMSMESSAGEWithBLOBs cus){
+
+        return customsmessageMapper.updateMessage(cus);
+    }
+
+
+    public int updateMessages(CustomReception cr){
+
+        CUSTOMSMESSAGEWithBLOBs cus = new CUSTOMSMESSAGEWithBLOBs();
+
+        cus.setMessageid(cr.getMessageID());
+        cus.setResponsetext(cr.getResponseText());
+
+        return customsmessageMapper.updateMessage(cus);
+    }
+
 }

@@ -32,6 +32,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
     @Override
     // 进出港理货
     public int insertRecept(CustomReception customReception, String mt) {
+
+
+        ShareServiceImp shareServiceImp = new ShareServiceImp();
+
         // 发送日志 插入
         CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
 
@@ -41,7 +45,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
         //回执内容
         String reception = customReception.getResponseText();
         String flightDateStr = customReception.getFlightDate();
-        Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        Date flightDate = new Date();
+        if (flightDateStr != null){
+            flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
+        }
 
         // 设置 进出港理货  回执
         TALLYSECONDARY tallysecondary = new TALLYSECONDARY();
@@ -81,7 +88,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
                     log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
                     int ii = coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -102,7 +110,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
                     log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
                     int ii =coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId);
 
-                    if (i>0 && ii>0){
+                    int iii = shareServiceImp.updateMessages(customReception);
+                    if (i>0 && ii>0 && iii > 0){
                         return 1;
                     }
                 }
@@ -110,7 +119,6 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
             }
         }else {
 
-            ShareServiceImp shareServiceImp = new ShareServiceImp();
             return shareServiceImp.share("MT5202", customReception);
         }
 

@@ -175,4 +175,12 @@
   <select id="selectMessage" parameterType="string" resultType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs">
     select * from CUSTOMSMESSAGE where MESSAGEID = #{value}
   </select>
+
+
+  <update id="updateMessage" parameterType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs">
+    UPDATE CUSTOMSMESSAGE
+    SET RESPONSETEXT = #{responsetext, jdbcType=VARCHAR}
+    WHERE
+      MESSAGEID = #{messageid, jdbcType=VARCHAR}
+  </update>
 </mapper>
\ No newline at end of file

@@ -964,325 +964,325 @@
       UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
-  <resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">
-    <result column="AUTOID" jdbcType="VARCHAR" property="autoid" />
-    <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />
-    <result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />
-    <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />
-    <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />
-    <result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />
-    <result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />
-    <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />
-    <result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />
-    <result column="CARRIER" jdbcType="VARCHAR" property="carrier" />
-    <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />
-    <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />
-    <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />
-    <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />
-    <result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />
-    <result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />
-    <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />
-    <result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />
-    <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />
-    <result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />
-    <result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />
-    <result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />
-    <result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />
-    <result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />
-    <result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />
-    <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />
-    <result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />
-    <result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />
-    <result column="STATUS" jdbcType="VARCHAR" property="status" />
-    <result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />
-    <result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />
-    <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />
-    <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />
-    <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />
-    <result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />
-    <result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />
-    <result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />
-    <result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />
-    <result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />
-    <result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />
-  </resultMap>
-  <insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">
-    insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY, 
-      TOTALWEIGHT, TOTALPIECE, PREPAREPIECE, 
-      PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID, 
-      CARRIER, FLIGHTNO, FLIGHTDATE, 
-      ORIGINATINGSTATION, DESTINATIONSTATION, 
-      CUSTOMSSTATUS, PAYMODE, PRODUCTNAME, 
-      STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME, 
-      SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, 
-      CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION, 
-      AGENTCODE, AGENTNAME, STATUS, 
-      SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, 
-      SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, 
-      CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO, 
-      CONSIGNEE_AEO, UNLOADINGSTATION)
-    values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR}, 
-      #{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR}, 
-      #{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR}, 
-      #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP}, 
-      #{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, 
-      #{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, 
-      #{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, 
-      #{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR}, 
-      #{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, 
-      #{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
-      #{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, 
-      #{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, 
-      #{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR}, 
-      #{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">
-    insert into PREPARESECONDARY
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="autoid != null">
-        AUTOID,
-      </if>
-      <if test="waybillnomaster != null">
-        WAYBILLNOMASTER,
-      </if>
-      <if test="waybillnosecondary != null">
-        WAYBILLNOSECONDARY,
-      </if>
-      <if test="totalweight != null">
-        TOTALWEIGHT,
-      </if>
-      <if test="totalpiece != null">
-        TOTALPIECE,
-      </if>
-      <if test="preparepiece != null">
-        PREPAREPIECE,
-      </if>
-      <if test="prepareweight != null">
-        PREPAREWEIGHT,
-      </if>
-      <if test="createdate != null">
-        CREATEDATE,
-      </if>
-      <if test="preparemasterid != null">
-        PREPAREMASTERID,
-      </if>
-      <if test="carrier != null">
-        CARRIER,
-      </if>
-      <if test="flightno != null">
-        FLIGHTNO,
-      </if>
-      <if test="flightdate != null">
-        FLIGHTDATE,
-      </if>
-      <if test="originatingstation != null">
-        ORIGINATINGSTATION,
-      </if>
-      <if test="destinationstation != null">
-        DESTINATIONSTATION,
-      </if>
-      <if test="customsstatus != null">
-        CUSTOMSSTATUS,
-      </if>
-      <if test="paymode != null">
-        PAYMODE,
-      </if>
-      <if test="productname != null">
-        PRODUCTNAME,
-      </if>
-      <if test="stowagedate != null">
-        STOWAGEDATE,
-      </if>
-      <if test="customscode != null">
-        CUSTOMSCODE,
-      </if>
-      <if test="shippername != null">
-        SHIPPERNAME,
-      </if>
-      <if test="shippercity != null">
-        SHIPPERCITY,
-      </if>
-      <if test="shipperaddress != null">
-        SHIPPERADDRESS,
-      </if>
-      <if test="consigneename != null">
-        CONSIGNEENAME,
-      </if>
-      <if test="consigneecity != null">
-        CONSIGNEECITY,
-      </if>
-      <if test="consigneeaddress != null">
-        CONSIGNEEADDRESS,
-      </if>
-      <if test="receiptinformation != null">
-        RECEIPTINFORMATION,
-      </if>
-      <if test="agentcode != null">
-        AGENTCODE,
-      </if>
-      <if test="agentname != null">
-        AGENTNAME,
-      </if>
-      <if test="status != null">
-        STATUS,
-      </if>
-      <if test="shipperCode != null">
-        SHIPPER_CODE,
-      </if>
-      <if test="shipperCountrycode != null">
-        SHIPPER_COUNTRYCODE,
-      </if>
-      <if test="shipperPhone != null">
-        SHIPPER_PHONE,
-      </if>
-      <if test="shipperFax != null">
-        SHIPPER_FAX,
-      </if>
-      <if test="consigneeCode != null">
-        CONSIGNEE_CODE,
-      </if>
-      <if test="consigneeCountrycode != null">
-        CONSIGNEE_COUNTRYCODE,
-      </if>
-      <if test="consigneePhone != null">
-        CONSIGNEE_PHONE,
-      </if>
-      <if test="consigneeFax != null">
-        CONSIGNEE_FAX,
-      </if>
-      <if test="shipperAeo != null">
-        SHIPPER_AEO,
-      </if>
-      <if test="consigneeAeo != null">
-        CONSIGNEE_AEO,
-      </if>
-      <if test="unloadingstation != null">
-        UNLOADINGSTATION,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="autoid != null">
-        #{autoid,jdbcType=VARCHAR},
-      </if>
-      <if test="waybillnomaster != null">
-        #{waybillnomaster,jdbcType=VARCHAR},
-      </if>
-      <if test="waybillnosecondary != null">
-        #{waybillnosecondary,jdbcType=VARCHAR},
-      </if>
-      <if test="totalweight != null">
-        #{totalweight,jdbcType=VARCHAR},
-      </if>
-      <if test="totalpiece != null">
-        #{totalpiece,jdbcType=VARCHAR},
-      </if>
-      <if test="preparepiece != null">
-        #{preparepiece,jdbcType=VARCHAR},
-      </if>
-      <if test="prepareweight != null">
-        #{prepareweight,jdbcType=VARCHAR},
-      </if>
-      <if test="createdate != null">
-        #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="preparemasterid != null">
-        #{preparemasterid,jdbcType=VARCHAR},
-      </if>
-      <if test="carrier != null">
-        #{carrier,jdbcType=VARCHAR},
-      </if>
-      <if test="flightno != null">
-        #{flightno,jdbcType=VARCHAR},
-      </if>
-      <if test="flightdate != null">
-        #{flightdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="originatingstation != null">
-        #{originatingstation,jdbcType=VARCHAR},
-      </if>
-      <if test="destinationstation != null">
-        #{destinationstation,jdbcType=VARCHAR},
-      </if>
-      <if test="customsstatus != null">
-        #{customsstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="paymode != null">
-        #{paymode,jdbcType=VARCHAR},
-      </if>
-      <if test="productname != null">
-        #{productname,jdbcType=VARCHAR},
-      </if>
-      <if test="stowagedate != null">
-        #{stowagedate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="customscode != null">
-        #{customscode,jdbcType=VARCHAR},
-      </if>
-      <if test="shippername != null">
-        #{shippername,jdbcType=VARCHAR},
-      </if>
-      <if test="shippercity != null">
-        #{shippercity,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperaddress != null">
-        #{shipperaddress,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneename != null">
-        #{consigneename,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneecity != null">
-        #{consigneecity,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeaddress != null">
-        #{consigneeaddress,jdbcType=VARCHAR},
-      </if>
-      <if test="receiptinformation != null">
-        #{receiptinformation,jdbcType=VARCHAR},
-      </if>
-      <if test="agentcode != null">
-        #{agentcode,jdbcType=VARCHAR},
-      </if>
-      <if test="agentname != null">
-        #{agentname,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCode != null">
-        #{shipperCode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperCountrycode != null">
-        #{shipperCountrycode,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperPhone != null">
-        #{shipperPhone,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperFax != null">
-        #{shipperFax,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeCode != null">
-        #{consigneeCode,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeCountrycode != null">
-        #{consigneeCountrycode,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneePhone != null">
-        #{consigneePhone,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeFax != null">
-        #{consigneeFax,jdbcType=VARCHAR},
-      </if>
-      <if test="shipperAeo != null">
-        #{shipperAeo,jdbcType=VARCHAR},
-      </if>
-      <if test="consigneeAeo != null">
-        #{consigneeAeo,jdbcType=VARCHAR},
-      </if>
-      <if test="unloadingstation != null">
-        #{unloadingstation,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
+  <!--<resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">-->
+    <!--<result column="AUTOID" jdbcType="VARCHAR" property="autoid" />-->
+    <!--<result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />-->
+    <!--<result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />-->
+    <!--<result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />-->
+    <!--<result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />-->
+    <!--<result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />-->
+    <!--<result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />-->
+    <!--<result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />-->
+    <!--<result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />-->
+    <!--<result column="CARRIER" jdbcType="VARCHAR" property="carrier" />-->
+    <!--<result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />-->
+    <!--<result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />-->
+    <!--<result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />-->
+    <!--<result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />-->
+    <!--<result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />-->
+    <!--<result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />-->
+    <!--<result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />-->
+    <!--<result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />-->
+    <!--<result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />-->
+    <!--<result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />-->
+    <!--<result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />-->
+    <!--<result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />-->
+    <!--<result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />-->
+    <!--<result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />-->
+    <!--<result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />-->
+    <!--<result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />-->
+    <!--<result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />-->
+    <!--<result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />-->
+    <!--<result column="STATUS" jdbcType="VARCHAR" property="status" />-->
+    <!--<result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />-->
+    <!--<result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />-->
+    <!--<result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />-->
+    <!--<result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />-->
+    <!--<result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />-->
+    <!--<result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />-->
+    <!--<result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />-->
+    <!--<result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />-->
+    <!--<result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />-->
+    <!--<result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />-->
+    <!--<result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />-->
+  <!--</resultMap>-->
+  <!--<insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
+    <!--insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY, -->
+      <!--TOTALWEIGHT, TOTALPIECE, PREPAREPIECE, -->
+      <!--PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID, -->
+      <!--CARRIER, FLIGHTNO, FLIGHTDATE, -->
+      <!--ORIGINATINGSTATION, DESTINATIONSTATION, -->
+      <!--CUSTOMSSTATUS, PAYMODE, PRODUCTNAME, -->
+      <!--STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME, -->
+      <!--SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, -->
+      <!--CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION, -->
+      <!--AGENTCODE, AGENTNAME, STATUS, -->
+      <!--SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, -->
+      <!--SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, -->
+      <!--CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO, -->
+      <!--CONSIGNEE_AEO, UNLOADINGSTATION)-->
+    <!--values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR}, -->
+      <!--#{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR}, -->
+      <!--#{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR}, -->
+      <!--#{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP}, -->
+      <!--#{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, -->
+      <!--#{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, -->
+      <!--#{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, -->
+      <!--#{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR}, -->
+      <!--#{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, -->
+      <!--#{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, -->
+      <!--#{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, -->
+      <!--#{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, -->
+      <!--#{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR}, -->
+      <!--#{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})-->
+  <!--</insert>-->
+  <!--<insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
+    <!--insert into PREPARESECONDARY-->
+    <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
+      <!--<if test="autoid != null">-->
+        <!--AUTOID,-->
+      <!--</if>-->
+      <!--<if test="waybillnomaster != null">-->
+        <!--WAYBILLNOMASTER,-->
+      <!--</if>-->
+      <!--<if test="waybillnosecondary != null">-->
+        <!--WAYBILLNOSECONDARY,-->
+      <!--</if>-->
+      <!--<if test="totalweight != null">-->
+        <!--TOTALWEIGHT,-->
+      <!--</if>-->
+      <!--<if test="totalpiece != null">-->
+        <!--TOTALPIECE,-->
+      <!--</if>-->
+      <!--<if test="preparepiece != null">-->
+        <!--PREPAREPIECE,-->
+      <!--</if>-->
+      <!--<if test="prepareweight != null">-->
+        <!--PREPAREWEIGHT,-->
+      <!--</if>-->
+      <!--<if test="createdate != null">-->
+        <!--CREATEDATE,-->
+      <!--</if>-->
+      <!--<if test="preparemasterid != null">-->
+        <!--PREPAREMASTERID,-->
+      <!--</if>-->
+      <!--<if test="carrier != null">-->
+        <!--CARRIER,-->
+      <!--</if>-->
+      <!--<if test="flightno != null">-->
+        <!--FLIGHTNO,-->
+      <!--</if>-->
+      <!--<if test="flightdate != null">-->
+        <!--FLIGHTDATE,-->
+      <!--</if>-->
+      <!--<if test="originatingstation != null">-->
+        <!--ORIGINATINGSTATION,-->
+      <!--</if>-->
+      <!--<if test="destinationstation != null">-->
+        <!--DESTINATIONSTATION,-->
+      <!--</if>-->
+      <!--<if test="customsstatus != null">-->
+        <!--CUSTOMSSTATUS,-->
+      <!--</if>-->
+      <!--<if test="paymode != null">-->
+        <!--PAYMODE,-->
+      <!--</if>-->
+      <!--<if test="productname != null">-->
+        <!--PRODUCTNAME,-->
+      <!--</if>-->
+      <!--<if test="stowagedate != null">-->
+        <!--STOWAGEDATE,-->
+      <!--</if>-->
+      <!--<if test="customscode != null">-->
+        <!--CUSTOMSCODE,-->
+      <!--</if>-->
+      <!--<if test="shippername != null">-->
+        <!--SHIPPERNAME,-->
+      <!--</if>-->
+      <!--<if test="shippercity != null">-->
+        <!--SHIPPERCITY,-->
+      <!--</if>-->
+      <!--<if test="shipperaddress != null">-->
+        <!--SHIPPERADDRESS,-->
+      <!--</if>-->
+      <!--<if test="consigneename != null">-->
+        <!--CONSIGNEENAME,-->
+      <!--</if>-->
+      <!--<if test="consigneecity != null">-->
+        <!--CONSIGNEECITY,-->
+      <!--</if>-->
+      <!--<if test="consigneeaddress != null">-->
+        <!--CONSIGNEEADDRESS,-->
+      <!--</if>-->
+      <!--<if test="receiptinformation != null">-->
+        <!--RECEIPTINFORMATION,-->
+      <!--</if>-->
+      <!--<if test="agentcode != null">-->
+        <!--AGENTCODE,-->
+      <!--</if>-->
+      <!--<if test="agentname != null">-->
+        <!--AGENTNAME,-->
+      <!--</if>-->
+      <!--<if test="status != null">-->
+        <!--STATUS,-->
+      <!--</if>-->
+      <!--<if test="shipperCode != null">-->
+        <!--SHIPPER_CODE,-->
+      <!--</if>-->
+      <!--<if test="shipperCountrycode != null">-->
+        <!--SHIPPER_COUNTRYCODE,-->
+      <!--</if>-->
+      <!--<if test="shipperPhone != null">-->
+        <!--SHIPPER_PHONE,-->
+      <!--</if>-->
+      <!--<if test="shipperFax != null">-->
+        <!--SHIPPER_FAX,-->
+      <!--</if>-->
+      <!--<if test="consigneeCode != null">-->
+        <!--CONSIGNEE_CODE,-->
+      <!--</if>-->
+      <!--<if test="consigneeCountrycode != null">-->
+        <!--CONSIGNEE_COUNTRYCODE,-->
+      <!--</if>-->
+      <!--<if test="consigneePhone != null">-->
+        <!--CONSIGNEE_PHONE,-->
+      <!--</if>-->
+      <!--<if test="consigneeFax != null">-->
+        <!--CONSIGNEE_FAX,-->
+      <!--</if>-->
+      <!--<if test="shipperAeo != null">-->
+        <!--SHIPPER_AEO,-->
+      <!--</if>-->
+      <!--<if test="consigneeAeo != null">-->
+        <!--CONSIGNEE_AEO,-->
+      <!--</if>-->
+      <!--<if test="unloadingstation != null">-->
+        <!--UNLOADINGSTATION,-->
+      <!--</if>-->
+    <!--</trim>-->
+    <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
+      <!--<if test="autoid != null">-->
+        <!--#{autoid,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="waybillnomaster != null">-->
+        <!--#{waybillnomaster,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="waybillnosecondary != null">-->
+        <!--#{waybillnosecondary,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="totalweight != null">-->
+        <!--#{totalweight,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="totalpiece != null">-->
+        <!--#{totalpiece,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="preparepiece != null">-->
+        <!--#{preparepiece,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="prepareweight != null">-->
+        <!--#{prepareweight,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="createdate != null">-->
+        <!--#{createdate,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="preparemasterid != null">-->
+        <!--#{preparemasterid,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="carrier != null">-->
+        <!--#{carrier,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="flightno != null">-->
+        <!--#{flightno,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="flightdate != null">-->
+        <!--#{flightdate,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="originatingstation != null">-->
+        <!--#{originatingstation,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="destinationstation != null">-->
+        <!--#{destinationstation,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="customsstatus != null">-->
+        <!--#{customsstatus,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="paymode != null">-->
+        <!--#{paymode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="productname != null">-->
+        <!--#{productname,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="stowagedate != null">-->
+        <!--#{stowagedate,jdbcType=TIMESTAMP},-->
+      <!--</if>-->
+      <!--<if test="customscode != null">-->
+        <!--#{customscode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shippername != null">-->
+        <!--#{shippername,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shippercity != null">-->
+        <!--#{shippercity,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperaddress != null">-->
+        <!--#{shipperaddress,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneename != null">-->
+        <!--#{consigneename,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneecity != null">-->
+        <!--#{consigneecity,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneeaddress != null">-->
+        <!--#{consigneeaddress,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="receiptinformation != null">-->
+        <!--#{receiptinformation,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="agentcode != null">-->
+        <!--#{agentcode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="agentname != null">-->
+        <!--#{agentname,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="status != null">-->
+        <!--#{status,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperCode != null">-->
+        <!--#{shipperCode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperCountrycode != null">-->
+        <!--#{shipperCountrycode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperPhone != null">-->
+        <!--#{shipperPhone,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperFax != null">-->
+        <!--#{shipperFax,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneeCode != null">-->
+        <!--#{consigneeCode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneeCountrycode != null">-->
+        <!--#{consigneeCountrycode,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneePhone != null">-->
+        <!--#{consigneePhone,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneeFax != null">-->
+        <!--#{consigneeFax,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="shipperAeo != null">-->
+        <!--#{shipperAeo,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="consigneeAeo != null">-->
+        <!--#{consigneeAeo,jdbcType=VARCHAR},-->
+      <!--</if>-->
+      <!--<if test="unloadingstation != null">-->
+        <!--#{unloadingstation,jdbcType=VARCHAR},-->
+      <!--</if>-->
+    <!--</trim>-->
+  <!--</insert>-->
 
 
   <update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" >