wlxxpt / customAnalysis · 提交

转到一个项目

作者 申海龙
提交 c239d0251ed7996a2bb5ddf0609d2cbb6c2f3a63 1 个父辈 26cdddda

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

内嵌 并排对比
正在显示 10 个修改的文件 包含 535 行增加 和 419 行删除
@@ -8,4 +8,6 @@ public interface CUSTOMSMESSAGEMapper { @@ -8,4 +8,6 @@ public interface CUSTOMSMESSAGEMapper {
8 int insertSelective(CUSTOMSMESSAGEWithBLOBs record); 8 int insertSelective(CUSTOMSMESSAGEWithBLOBs record);
9 9
10 CUSTOMSMESSAGEWithBLOBs selectMessage(String messageId); 10 CUSTOMSMESSAGEWithBLOBs selectMessage(String messageId);
  11 +
  12 + int updateMessage(CUSTOMSMESSAGEWithBLOBs record);
11 } 13 }
@@ -95,14 +95,23 @@ public class CustomXmlHandle{ @@ -95,14 +95,23 @@ public class CustomXmlHandle{
95 //要解析的回执类型 95 //要解析的回执类型
96 String type= "MT9999"; 96 String type= "MT9999";
97 97
  98 + String flightNo = "";
  99 + String flightDate = "";
  100 +
98 //开始解析 101 //开始解析
99 // fzeFoh.setGrossweightmeasureuc(XMLXPath.getSingleValueByPath(document,GrossWeightMeasureUc)); 102 // fzeFoh.setGrossweightmeasureuc(XMLXPath.getSingleValueByPath(document,GrossWeightMeasureUc));
100 String msgType = XMLXPath.getSingleValueByPath(document,MessageType); 103 String msgType = XMLXPath.getSingleValueByPath(document,MessageType);
101 String journeyid = XMLXPath.getSingleValueByPath(document,JourneyID); 104 String journeyid = XMLXPath.getSingleValueByPath(document,JourneyID);
102 // XMLXPath.getSingleValueByPath(document, ) 105 // XMLXPath.getSingleValueByPath(document, )
  106 +
  107 + if(journeyid != null){
  108 +
103 String[] flightList = journeyid.split("/"); 109 String[] flightList = journeyid.split("/");
104 - String flightNo = flightList[0];  
105 - String flightDate = flightList[1]; 110 +
  111 + flightNo = flightList[0];
  112 + flightDate = flightList[1];
  113 + }
  114 +
106 String awbA = XMLXPath.getSingleValueByPath(document,waybillMaster); 115 String awbA = XMLXPath.getSingleValueByPath(document,waybillMaster);
107 //全格式的分单 如 17212345678_ADBD 116 //全格式的分单 如 17212345678_ADBD
108 String awbH = XMLXPath.getSingleValueByPath(document,waybillSecond); 117 String awbH = XMLXPath.getSingleValueByPath(document,waybillSecond);
@@ -113,18 +122,25 @@ public class CustomXmlHandle{ @@ -113,18 +122,25 @@ public class CustomXmlHandle{
113 switch (msgType){ 122 switch (msgType){
114 case "MT9999": 123 case "MT9999":
115 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception); 124 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception);
  125 + break;
116 case "MT3201": 126 case "MT3201":
117 i= customXmlHandle.arrivedmasterService.insertRecept(customReception); 127 i= customXmlHandle.arrivedmasterService.insertRecept(customReception);
  128 + break;
118 case "MT5202": 129 case "MT5202":
119 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5202"); 130 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5202");
  131 + break;
120 case "MT5201": 132 case "MT5201":
121 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5201"); 133 i = customXmlHandle.tallymasterService.insertRecept(customReception, "MT5201");
  134 + break;
122 case "MT4201": 135 case "MT4201":
123 i = customXmlHandle.departuresloadingService.insertRecept(customReception); 136 i = customXmlHandle.departuresloadingService.insertRecept(customReception);
  137 + break;
124 case "MT1201": 138 case "MT1201":
125 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception); 139 i = customXmlHandle.coustomAnalysisService.insertRecept(customReception);
  140 + break;
126 case "MT2201": 141 case "MT2201":
127 i = customXmlHandle.preparemasterService.insertRecept(customReception); 142 i = customXmlHandle.preparemasterService.insertRecept(customReception);
  143 + break;
128 144
129 } 145 }
130 146
@@ -34,6 +34,7 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService { @@ -34,6 +34,7 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
34 // 货物接收运抵主分单 34 // 货物接收运抵主分单
35 public int insertRecept(CustomReception customReception) { 35 public int insertRecept(CustomReception customReception) {
36 36
  37 + ShareServiceImp shareServiceImp = new ShareServiceImp();
37 38
38 // 发送日志 插入 39 // 发送日志 插入
39 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 40 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
@@ -44,7 +45,10 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService { @@ -44,7 +45,10 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
44 //回执内容 45 //回执内容
45 String reception = customReception.getResponseText(); 46 String reception = customReception.getResponseText();
46 String flightDateStr = customReception.getFlightDate(); 47 String flightDateStr = customReception.getFlightDate();
47 - Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr); 48 + Date flightDate = new Date();
  49 + if (flightDateStr != null){
  50 + flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
  51 + }
48 52
49 // 设置 接收运抵分单 回执 53 // 设置 接收运抵分单 回执
50 ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY(); 54 ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();
@@ -85,7 +89,8 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService { @@ -85,7 +89,8 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
85 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId); 89 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
86 int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId); 90 int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
87 91
88 - if (i>0 && ii>0){ 92 + int iii = shareServiceImp.updateMessages(customReception);
  93 + if (i>0 && ii>0 && iii > 0){
89 return 1; 94 return 1;
90 } 95 }
91 } 96 }
@@ -106,14 +111,15 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService { @@ -106,14 +111,15 @@ public class ARRIVEDMASTERServiceImp implements ARRIVEDMASTERService {
106 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId); 111 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
107 int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId); 112 int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
108 113
109 - if (i>0 && ii>0){ 114 + int iii = shareServiceImp.updateMessages(customReception);
  115 + if (i>0 && ii>0 && iii > 0){
110 return 1; 116 return 1;
111 } 117 }
112 } 118 }
113 return 0; 119 return 0;
114 } 120 }
115 }else { 121 }else {
116 - ShareServiceImp shareServiceImp = new ShareServiceImp(); 122 +
117 return shareServiceImp.share("MT3201", customReception); 123 return shareServiceImp.share("MT3201", customReception);
118 } 124 }
119 125
@@ -33,12 +33,20 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService { @@ -33,12 +33,20 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
33 @Override 33 @Override
34 public int insertRecept(CustomReception customReception){ 34 public int insertRecept(CustomReception customReception){
35 35
  36 + ShareServiceImp shareServiceImp = new ShareServiceImp();
  37 +
  38 +
36 String awbA = customReception.getWayBillMaster(); 39 String awbA = customReception.getWayBillMaster();
37 String awbH = customReception.getWayBillSecond(); 40 String awbH = customReception.getWayBillSecond();
38 // 回执内容 41 // 回执内容
39 String reception = customReception.getResponseText(); 42 String reception = customReception.getResponseText();
40 String flightDateStr = customReception.getFlightDate(); 43 String flightDateStr = customReception.getFlightDate();
41 - Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr); 44 +
  45 + Date flightDate = new Date();
  46 + if (flightDateStr != null){
  47 + flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
  48 + }
  49 +
42 50
43 // 设置分单回执 51 // 设置分单回执
44 Originmanifestsecondary originmanifestsecondary = new Originmanifestsecondary(); 52 Originmanifestsecondary originmanifestsecondary = new Originmanifestsecondary();
@@ -79,7 +87,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService { @@ -79,7 +87,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
79 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId); 87 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
80 int ii = insertSendlog("MT1201",reception,autoId); 88 int ii = insertSendlog("MT1201",reception,autoId);
81 89
82 - if (i>0 && ii>0){ 90 + int iii = shareServiceImp.updateMessages(customReception);
  91 + if (i>0 && ii>0 && iii > 0){
83 return 1; 92 return 1;
84 } 93 }
85 } 94 }
@@ -100,7 +109,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService { @@ -100,7 +109,8 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
100 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId); 109 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
101 int ii =insertSendlog("MT1201",reception,autoId); 110 int ii =insertSendlog("MT1201",reception,autoId);
102 111
103 - if (i>0 && ii>0){ 112 + int iii = shareServiceImp.updateMessages(customReception);
  113 + if (i>0 && ii>0 && iii > 0){
104 return 1; 114 return 1;
105 } 115 }
106 } 116 }
@@ -108,7 +118,7 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService { @@ -108,7 +118,7 @@ public class CoustomAnalysisServiceImp implements CoustomAnalysisService {
108 } 118 }
109 }else { 119 }else {
110 120
111 - ShareServiceImp shareServiceImp = new ShareServiceImp(); 121 +
112 return shareServiceImp.share("MT1201", customReception); 122 return shareServiceImp.share("MT1201", customReception);
113 } 123 }
114 124
@@ -25,6 +25,9 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{ @@ -25,6 +25,9 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
25 25
26 @Override 26 @Override
27 public int insertRecept(CustomReception customReception) { 27 public int insertRecept(CustomReception customReception) {
  28 +
  29 + ShareServiceImp shareServiceImp = new ShareServiceImp();
  30 +
28 // 发送日志 插入 31 // 发送日志 插入
29 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 32 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
30 33
@@ -34,7 +37,10 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{ @@ -34,7 +37,10 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
34 //回执内容 37 //回执内容
35 String reception = customReception.getResponseText(); 38 String reception = customReception.getResponseText();
36 String flightDateStr = customReception.getFlightDate(); 39 String flightDateStr = customReception.getFlightDate();
37 - Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr); 40 + Date flightDate = new Date();
  41 + if (flightDateStr != null){
  42 + flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
  43 + }
38 44
39 //设置主单回执、航班号、航班日期 45 //设置主单回执、航班号、航班日期
40 DEPARTURESLOADING departuresloading = new DEPARTURESLOADING(); 46 DEPARTURESLOADING departuresloading = new DEPARTURESLOADING();
@@ -68,14 +74,15 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{ @@ -68,14 +74,15 @@ public class DEPARTURESLOADINGServiceImp implements DEPARTURESLOADINGService{
68 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId); 74 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
69 int ii =coustomAnalysisServiceImp.insertSendlog("MT4201",reception,autoId); 75 int ii =coustomAnalysisServiceImp.insertSendlog("MT4201",reception,autoId);
70 76
71 - if (i>0 && ii>0){ 77 + int iii = shareServiceImp.updateMessages(customReception);
  78 + if (i>0 && ii>0 && iii > 0){
72 return 1; 79 return 1;
73 } 80 }
74 } 81 }
75 return 0; 82 return 0;
76 } 83 }
77 }else { 84 }else {
78 - ShareServiceImp shareServiceImp = new ShareServiceImp(); 85 +
79 return shareServiceImp.share("MT4201", customReception); 86 return shareServiceImp.share("MT4201", customReception);
80 } 87 }
81 //未进入主分单解析 返回0 失败 88 //未进入主分单解析 返回0 失败
@@ -32,6 +32,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { @@ -32,6 +32,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
32 // 货物接收运抵主分单 32 // 货物接收运抵主分单
33 public int insertRecept(CustomReception customReception) { 33 public int insertRecept(CustomReception customReception) {
34 34
  35 +
  36 + ShareServiceImp shareServiceImp = new ShareServiceImp();
35 // 发送日志 插入 37 // 发送日志 插入
36 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 38 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
37 39
@@ -41,7 +43,10 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { @@ -41,7 +43,10 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
41 //回执内容 43 //回执内容
42 String reception = customReception.getResponseText(); 44 String reception = customReception.getResponseText();
43 String flightDateStr = customReception.getFlightDate(); 45 String flightDateStr = customReception.getFlightDate();
44 - Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr); 46 + Date flightDate = new Date();
  47 + if (flightDateStr != null){
  48 + flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
  49 + }
45 50
46 // 设置 接收运抵分单 回执 51 // 设置 接收运抵分单 回执
47 PREPARESECONDARY preparesecondary = new PREPARESECONDARY(); 52 PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
@@ -83,7 +88,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { @@ -83,7 +88,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
83 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId); 88 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
84 int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId); 89 int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
85 90
86 - if (i>0 && ii>0){ 91 + int iii = shareServiceImp.updateMessages(customReception);
  92 + if (i>0 && ii>0 && iii > 0){
87 return 1; 93 return 1;
88 } 94 }
89 } 95 }
@@ -104,7 +110,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { @@ -104,7 +110,8 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
104 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId); 110 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
105 int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId); 111 int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
106 112
107 - if (i>0 && ii>0){ 113 + int iii = shareServiceImp.updateMessages(customReception);
  114 + if (i>0 && ii>0 && iii > 0){
108 return 1; 115 return 1;
109 } 116 }
110 } 117 }
@@ -112,7 +119,7 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { @@ -112,7 +119,7 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
112 } 119 }
113 }else { 120 }else {
114 121
115 - ShareServiceImp shareServiceImp = new ShareServiceImp(); 122 +
116 return shareServiceImp.share("MT2201", customReception); 123 return shareServiceImp.share("MT2201", customReception);
117 } 124 }
118 125
@@ -58,8 +58,28 @@ public class ShareServiceImp { @@ -58,8 +58,28 @@ public class ShareServiceImp {
58 case "MT9999": 58 case "MT9999":
59 return MT1201MT9999(customReception, cus, type); 59 return MT1201MT9999(customReception, cus, type);
60 case "MT3201": 60 case "MT3201":
61 - // 判断 主单id 主单号是否为空  
62 - if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){ 61 + // 判断 分单id 分单号是否为空
  62 + if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
  63 + // 分单
  64 + ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();
  65 +
  66 + arrivedsecondary.setReceiption(customReception.getResponseText());
  67 + arrivedsecondary.setAutoid(cus.getSecondaryautoid());
  68 + arrivedsecondary.setWaybillnomaster(cus.getWaybillnomaster());
  69 + arrivedsecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
  70 + int i = arrivedsecondaryMapper.updateRECEIPTION(arrivedsecondary);
  71 + //插入sendlog记录表
  72 + log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
  73 + int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
  74 + // 更新海关表 内容回执
  75 + int iii = updateMessage(cus);
  76 +
  77 + if (i > 0 && ii > 0 && iii > 0) {
  78 +
  79 + return 1;
  80 + }
  81 + }else {
  82 +
63 String waybill = waybill(cus.getWaybillnomaster()); 83 String waybill = waybill(cus.getWaybillnomaster());
64 84
65 ARRIVEDMASTER arrivedmaster = new ARRIVEDMASTER(); 85 ARRIVEDMASTER arrivedmaster = new ARRIVEDMASTER();
@@ -74,28 +94,15 @@ public class ShareServiceImp { @@ -74,28 +94,15 @@ public class ShareServiceImp {
74 //插入sendlog记录表 94 //插入sendlog记录表
75 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid()); 95 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
76 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid()); 96 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
77 - if (i > 0 && ii > 0){ 97 + // 更新海关表 内容回执
  98 + int iii = updateMessage(cus);
  99 +
  100 + if (i > 0 && ii > 0 && iii > 0) {
78 101
79 return 1; 102 return 1;
80 } 103 }
81 104
82 return 0; 105 return 0;
83 - }else {  
84 - // 分单  
85 - ARRIVEDSECONDARY arrivedsecondary = new ARRIVEDSECONDARY();  
86 -  
87 - arrivedsecondary.setReceiption(customReception.getResponseText());  
88 - arrivedsecondary.setAutoid(cus.getSecondaryautoid());  
89 - arrivedsecondary.setWaybillnomaster(cus.getWaybillnomaster());  
90 - arrivedsecondary.setWaybillnosecondary(cus.getWaybillnosecondary());  
91 - int i = arrivedsecondaryMapper.updateRECEIPTION(arrivedsecondary);  
92 - //插入sendlog记录表  
93 - log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());  
94 - int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());  
95 - if (i > 0 && ii > 0){  
96 -  
97 - return 1;  
98 - }  
99 } 106 }
100 case "MT5202": 107 case "MT5202":
101 108
@@ -117,7 +124,10 @@ public class ShareServiceImp { @@ -117,7 +124,10 @@ public class ShareServiceImp {
117 //插入sendlog记录表 124 //插入sendlog记录表
118 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid()); 125 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
119 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid()); 126 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
120 - if (i > 0 && ii > 0){ 127 + // 更新海关表 内容回执
  128 + int iii1 = updateMessage(cus);
  129 +
  130 + if (i > 0 && ii > 0 && iii1 > 0) {
121 131
122 return 1; 132 return 1;
123 } 133 }
@@ -125,8 +135,28 @@ public class ShareServiceImp { @@ -125,8 +135,28 @@ public class ShareServiceImp {
125 135
126 return MT1201MT9999(customReception, cus, type); 136 return MT1201MT9999(customReception, cus, type);
127 case "MT2201": 137 case "MT2201":
128 - // 判断 主单id 主单号是否为空  
129 - if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){ 138 + // 判断 分单id 分单号是否为空
  139 + if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
  140 + // 分单
  141 + PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
  142 +
  143 + preparesecondary.setReceiptinformation(customReception.getResponseText());
  144 + preparesecondary.setAutoid(cus.getSecondaryautoid());
  145 + preparesecondary.setWaybillnomaster(cus.getWaybillnomaster());
  146 + preparesecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
  147 + int i1 = preparesecondaryMapper.updateRECEIPTION(preparesecondary);
  148 + //插入sendlog记录表
  149 + log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
  150 + int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
  151 + // 更新海关表 内容回执
  152 + int iii = updateMessage(cus);
  153 +
  154 + if (i1 > 0 && ii1 > 0 && iii > 0) {
  155 +
  156 + return 1;
  157 + }
  158 + }else {
  159 +
130 String waybill1 = waybill(cus.getWaybillnomaster()); 160 String waybill1 = waybill(cus.getWaybillnomaster());
131 161
132 PREPAREMASTER preparemaster = new PREPAREMASTER(); 162 PREPAREMASTER preparemaster = new PREPAREMASTER();
@@ -141,35 +171,21 @@ public class ShareServiceImp { @@ -141,35 +171,21 @@ public class ShareServiceImp {
141 //插入sendlog记录表 171 //插入sendlog记录表
142 log.info("即将插入日志运单号为:"+waybill1+"->autoid="+cus.getMasterautoid()); 172 log.info("即将插入日志运单号为:"+waybill1+"->autoid="+cus.getMasterautoid());
143 int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid()); 173 int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
144 - if (i1 > 0 && ii1 > 0){ 174 + // 更新海关表 内容回执
  175 + int iii = updateMessage(cus);
  176 +
  177 + if (i1 > 0 && ii1 > 0 && iii > 0) {
145 178
146 return 1; 179 return 1;
147 } 180 }
148 181
149 return 0; 182 return 0;
150 - }else {  
151 - // 分单  
152 - PREPARESECONDARY preparesecondary = new PREPARESECONDARY();  
153 -  
154 - preparesecondary.setReceiptinformation(customReception.getResponseText());  
155 - preparesecondary.setAutoid(cus.getSecondaryautoid());  
156 - preparesecondary.setWaybillnomaster(cus.getWaybillnomaster());  
157 - preparesecondary.setWaybillnosecondary(cus.getWaybillnosecondary());  
158 - int i1 = preparesecondaryMapper.updateRECEIPTION(preparesecondary);  
159 - //插入sendlog记录表  
160 - log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());  
161 - int ii1 = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());  
162 - if (i1 > 0 && ii1 > 0){  
163 -  
164 - return 1;  
165 } 183 }
166 } 184 }
167 - }  
168 -  
169 -  
170 return 0; 185 return 0;
171 } 186 }
172 187
  188 +
173 public String waybill (String waybill){ 189 public String waybill (String waybill){
174 190
175 StringBuffer stringBuffer = new StringBuffer(waybill); 191 StringBuffer stringBuffer = new StringBuffer(waybill);
@@ -183,8 +199,30 @@ public class ShareServiceImp { @@ -183,8 +199,30 @@ public class ShareServiceImp {
183 // 发送日志 插入 199 // 发送日志 插入
184 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 200 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
185 201
186 - // 判断 主单id 主单号是否为空  
187 - if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null){ 202 + // 判断 分单id 分单号是否为空
  203 + if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
  204 + // 分单
  205 + TALLYSECONDARY tallysecondary = new TALLYSECONDARY();
  206 +
  207 + tallysecondary.setReceiptinformation(customReception.getResponseText());
  208 + tallysecondary.setAutoid(cus.getSecondaryautoid());
  209 + tallysecondary.setWaybillnomaster(cus.getWaybillnomaster());
  210 + tallysecondary.setWaybillnosecondary(cus.getWaybillnosecondary());
  211 + int i = tallysecondaryMapper.updateRECEIPTION(tallysecondary);
  212 + //插入sendlog记录表
  213 + log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());
  214 + int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());
  215 + // 更新海关表 内容回执
  216 + int iii = updateMessage(cus);
  217 +
  218 + if (i > 0 && ii > 0 && iii > 0) {
  219 +
  220 + return 1;
  221 + }
  222 +
  223 + return 0;
  224 + }else {
  225 +
188 String waybill = waybill(cus.getWaybillnomaster()); 226 String waybill = waybill(cus.getWaybillnomaster());
189 227
190 TALLYMASTER tallymaster = new TALLYMASTER(); 228 TALLYMASTER tallymaster = new TALLYMASTER();
@@ -199,25 +237,10 @@ public class ShareServiceImp { @@ -199,25 +237,10 @@ public class ShareServiceImp {
199 //插入sendlog记录表 237 //插入sendlog记录表
200 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid()); 238 log.info("即将插入日志运单号为:"+waybill+"->autoid="+cus.getMasterautoid());
201 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid()); 239 int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getMasterautoid());
202 - if (i > 0 && ii > 0){ 240 + // 更新海关表 内容回执
  241 + int iii = updateMessage(cus);
203 242
204 - return 1;  
205 - }  
206 -  
207 - return 0;  
208 - }else {  
209 - // 分单  
210 - TALLYSECONDARY tallysecondary = new TALLYSECONDARY();  
211 -  
212 - tallysecondary.setReceiptinformation(customReception.getResponseText());  
213 - tallysecondary.setAutoid(cus.getSecondaryautoid());  
214 - tallysecondary.setWaybillnomaster(cus.getWaybillnomaster());  
215 - tallysecondary.setWaybillnosecondary(cus.getWaybillnosecondary());  
216 - int i = tallysecondaryMapper.updateRECEIPTION(tallysecondary);  
217 - //插入sendlog记录表  
218 - log.info("即将插入日志运单号为:"+cus.getWaybillnosecondary()+"->autoid="+cus.getSecondaryautoid());  
219 - int ii = coustomAnalysisServiceImp.insertSendlog(type,customReception.getResponseText(),cus.getSecondaryautoid());  
220 - if (i > 0 && ii > 0){ 243 + if (i > 0 && ii > 0 && iii > 0) {
221 244
222 return 1; 245 return 1;
223 } 246 }
@@ -231,8 +254,30 @@ public class ShareServiceImp { @@ -231,8 +254,30 @@ public class ShareServiceImp {
231 public int MT1201MT9999(CustomReception customReception, CUSTOMSMESSAGEWithBLOBs cus, String type) { 254 public int MT1201MT9999(CustomReception customReception, CUSTOMSMESSAGEWithBLOBs cus, String type) {
232 // 发送日志 插入 255 // 发送日志 插入
233 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 256 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
234 - // 判断 主单id 主单号是否为空  
235 - if (cus.getMasterautoid() != null && cus.getWaybillnomaster() != null) { 257 + // 判断 分单id 分单号是否为空
  258 + if (cus.getSecondaryautoid() != null && cus.getWaybillnosecondary() != null) {
  259 + // 分单
  260 + Originmanifestsecondary or = new Originmanifestsecondary();
  261 +
  262 + or.setReceiption(customReception.getResponseText());
  263 + or.setAutoid(cus.getSecondaryautoid());
  264 + or.setWaybillnomaster(cus.getWaybillnomaster());
  265 + or.setWaybillnosecondary(cus.getWaybillnosecondary());
  266 + int i = originmanifestsecondaryMapper.updateRECEIPTION(or);
  267 + //插入sendlog记录表
  268 + log.info("即将插入日志运单号为:" + cus.getWaybillnosecondary() + "->autoid=" + cus.getSecondaryautoid());
  269 + int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getSecondaryautoid());
  270 +
  271 + // 更新海关表 内容回执
  272 + int iii = updateMessage(cus);
  273 +
  274 + if (i > 0 && ii > 0 && iii > 0) {
  275 +
  276 + return 1;
  277 + }
  278 + return 0;
  279 + } else {
  280 + // 主单
236 String waybill = waybill(cus.getWaybillnomaster()); 281 String waybill = waybill(cus.getWaybillnomaster());
237 282
238 ORIGINMANIFESTMASTER or = new ORIGINMANIFESTMASTER(); 283 ORIGINMANIFESTMASTER or = new ORIGINMANIFESTMASTER();
@@ -246,29 +291,36 @@ public class ShareServiceImp { @@ -246,29 +291,36 @@ public class ShareServiceImp {
246 //插入sendlog记录表 291 //插入sendlog记录表
247 log.info("即将插入日志运单号为:" + waybill + "->autoid=" + cus.getMasterautoid()); 292 log.info("即将插入日志运单号为:" + waybill + "->autoid=" + cus.getMasterautoid());
248 int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getMasterautoid()); 293 int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getMasterautoid());
249 - if (i > 0 && ii > 0) {  
250 294
251 - return 1;  
252 - }  
253 295
254 - return 0;  
255 - } else {  
256 - // 分单  
257 - Originmanifestsecondary or = new Originmanifestsecondary(); 296 + // 更新海关表 内容回执
  297 + int iii = updateMessage(cus);
258 298
259 - or.setReceiption(customReception.getResponseText());  
260 - or.setAutoid(cus.getSecondaryautoid());  
261 - or.setWaybillnomaster(cus.getWaybillnomaster());  
262 - or.setWaybillnosecondary(cus.getWaybillnosecondary());  
263 - int i = originmanifestsecondaryMapper.updateRECEIPTION(or);  
264 - //插入sendlog记录表  
265 - log.info("即将插入日志运单号为:" + cus.getWaybillnosecondary() + "->autoid=" + cus.getSecondaryautoid());  
266 - int ii = coustomAnalysisServiceImp.insertSendlog(type, customReception.getResponseText(), cus.getSecondaryautoid());  
267 - if (i > 0 && ii > 0) { 299 + if (i > 0 && ii > 0 && iii > 0) {
268 300
269 return 1; 301 return 1;
270 } 302 }
  303 +
271 return 0; 304 return 0;
272 } 305 }
273 } 306 }
  307 +
  308 +
  309 + // messageId 更新
  310 + public int updateMessage(CUSTOMSMESSAGEWithBLOBs cus){
  311 +
  312 + return customsmessageMapper.updateMessage(cus);
  313 + }
  314 +
  315 +
  316 + public int updateMessages(CustomReception cr){
  317 +
  318 + CUSTOMSMESSAGEWithBLOBs cus = new CUSTOMSMESSAGEWithBLOBs();
  319 +
  320 + cus.setMessageid(cr.getMessageID());
  321 + cus.setResponsetext(cr.getResponseText());
  322 +
  323 + return customsmessageMapper.updateMessage(cus);
  324 + }
  325 +
274 } 326 }
@@ -32,6 +32,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{ @@ -32,6 +32,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
32 @Override 32 @Override
33 // 进出港理货 33 // 进出港理货
34 public int insertRecept(CustomReception customReception, String mt) { 34 public int insertRecept(CustomReception customReception, String mt) {
  35 +
  36 +
  37 + ShareServiceImp shareServiceImp = new ShareServiceImp();
  38 +
35 // 发送日志 插入 39 // 发送日志 插入
36 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp(); 40 CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
37 41
@@ -41,7 +45,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{ @@ -41,7 +45,10 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
41 //回执内容 45 //回执内容
42 String reception = customReception.getResponseText(); 46 String reception = customReception.getResponseText();
43 String flightDateStr = customReception.getFlightDate(); 47 String flightDateStr = customReception.getFlightDate();
44 - Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr); 48 + Date flightDate = new Date();
  49 + if (flightDateStr != null){
  50 + flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
  51 + }
45 52
46 // 设置 进出港理货 回执 53 // 设置 进出港理货 回执
47 TALLYSECONDARY tallysecondary = new TALLYSECONDARY(); 54 TALLYSECONDARY tallysecondary = new TALLYSECONDARY();
@@ -81,7 +88,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{ @@ -81,7 +88,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
81 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId); 88 log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
82 int ii = coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId); 89 int ii = coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId);
83 90
84 - if (i>0 && ii>0){ 91 + int iii = shareServiceImp.updateMessages(customReception);
  92 + if (i>0 && ii>0 && iii > 0){
85 return 1; 93 return 1;
86 } 94 }
87 } 95 }
@@ -102,7 +110,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{ @@ -102,7 +110,8 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
102 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId); 110 log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
103 int ii =coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId); 111 int ii =coustomAnalysisServiceImp.insertSendlog(mt,reception,autoId);
104 112
105 - if (i>0 && ii>0){ 113 + int iii = shareServiceImp.updateMessages(customReception);
  114 + if (i>0 && ii>0 && iii > 0){
106 return 1; 115 return 1;
107 } 116 }
108 } 117 }
@@ -110,7 +119,6 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{ @@ -110,7 +119,6 @@ public class TALLYMASTERServiceImp implements TALLYMASTERService{
110 } 119 }
111 }else { 120 }else {
112 121
113 - ShareServiceImp shareServiceImp = new ShareServiceImp();  
114 return shareServiceImp.share("MT5202", customReception); 122 return shareServiceImp.share("MT5202", customReception);
115 } 123 }
116 124
@@ -175,4 +175,12 @@ @@ -175,4 +175,12 @@
175 <select id="selectMessage" parameterType="string" resultType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs"> 175 <select id="selectMessage" parameterType="string" resultType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs">
176 select * from CUSTOMSMESSAGE where MESSAGEID = #{value} 176 select * from CUSTOMSMESSAGE where MESSAGEID = #{value}
177 </select> 177 </select>
  178 +
  179 +
  180 + <update id="updateMessage" parameterType="com.tianbo.analysis.model.CUSTOMSMESSAGEWithBLOBs">
  181 + UPDATE CUSTOMSMESSAGE
  182 + SET RESPONSETEXT = #{responsetext, jdbcType=VARCHAR}
  183 + WHERE
  184 + MESSAGEID = #{messageid, jdbcType=VARCHAR}
  185 + </update>
178 </mapper> 186 </mapper>
@@ -964,325 +964,325 @@ @@ -964,325 +964,325 @@
964 UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR} 964 UNLODINGCODE = #{unlodingcode,jdbcType=VARCHAR}
965 where ID = #{id,jdbcType=DECIMAL} 965 where ID = #{id,jdbcType=DECIMAL}
966 </update> 966 </update>
967 - <resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">  
968 - <result column="AUTOID" jdbcType="VARCHAR" property="autoid" />  
969 - <result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />  
970 - <result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />  
971 - <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />  
972 - <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />  
973 - <result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />  
974 - <result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />  
975 - <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />  
976 - <result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />  
977 - <result column="CARRIER" jdbcType="VARCHAR" property="carrier" />  
978 - <result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />  
979 - <result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />  
980 - <result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />  
981 - <result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />  
982 - <result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />  
983 - <result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />  
984 - <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />  
985 - <result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />  
986 - <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />  
987 - <result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />  
988 - <result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />  
989 - <result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />  
990 - <result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />  
991 - <result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />  
992 - <result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />  
993 - <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />  
994 - <result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />  
995 - <result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />  
996 - <result column="STATUS" jdbcType="VARCHAR" property="status" />  
997 - <result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />  
998 - <result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />  
999 - <result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />  
1000 - <result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />  
1001 - <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />  
1002 - <result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />  
1003 - <result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />  
1004 - <result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />  
1005 - <result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />  
1006 - <result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />  
1007 - <result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />  
1008 - </resultMap>  
1009 - <insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">  
1010 - insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY,  
1011 - TOTALWEIGHT, TOTALPIECE, PREPAREPIECE,  
1012 - PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID,  
1013 - CARRIER, FLIGHTNO, FLIGHTDATE,  
1014 - ORIGINATINGSTATION, DESTINATIONSTATION,  
1015 - CUSTOMSSTATUS, PAYMODE, PRODUCTNAME,  
1016 - STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME,  
1017 - SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME,  
1018 - CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION,  
1019 - AGENTCODE, AGENTNAME, STATUS,  
1020 - SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE,  
1021 - SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE,  
1022 - CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO,  
1023 - CONSIGNEE_AEO, UNLOADINGSTATION)  
1024 - values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR},  
1025 - #{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR},  
1026 - #{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR},  
1027 - #{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP},  
1028 - #{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR},  
1029 - #{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR},  
1030 - #{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR},  
1031 - #{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR},  
1032 - #{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR},  
1033 - #{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},  
1034 - #{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR},  
1035 - #{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR},  
1036 - #{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR},  
1037 - #{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})  
1038 - </insert>  
1039 - <insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">  
1040 - insert into PREPARESECONDARY  
1041 - <trim prefix="(" suffix=")" suffixOverrides=",">  
1042 - <if test="autoid != null">  
1043 - AUTOID,  
1044 - </if>  
1045 - <if test="waybillnomaster != null">  
1046 - WAYBILLNOMASTER,  
1047 - </if>  
1048 - <if test="waybillnosecondary != null">  
1049 - WAYBILLNOSECONDARY,  
1050 - </if>  
1051 - <if test="totalweight != null">  
1052 - TOTALWEIGHT,  
1053 - </if>  
1054 - <if test="totalpiece != null">  
1055 - TOTALPIECE,  
1056 - </if>  
1057 - <if test="preparepiece != null">  
1058 - PREPAREPIECE,  
1059 - </if>  
1060 - <if test="prepareweight != null">  
1061 - PREPAREWEIGHT,  
1062 - </if>  
1063 - <if test="createdate != null">  
1064 - CREATEDATE,  
1065 - </if>  
1066 - <if test="preparemasterid != null">  
1067 - PREPAREMASTERID,  
1068 - </if>  
1069 - <if test="carrier != null">  
1070 - CARRIER,  
1071 - </if>  
1072 - <if test="flightno != null">  
1073 - FLIGHTNO,  
1074 - </if>  
1075 - <if test="flightdate != null">  
1076 - FLIGHTDATE,  
1077 - </if>  
1078 - <if test="originatingstation != null">  
1079 - ORIGINATINGSTATION,  
1080 - </if>  
1081 - <if test="destinationstation != null">  
1082 - DESTINATIONSTATION,  
1083 - </if>  
1084 - <if test="customsstatus != null">  
1085 - CUSTOMSSTATUS,  
1086 - </if>  
1087 - <if test="paymode != null">  
1088 - PAYMODE,  
1089 - </if>  
1090 - <if test="productname != null">  
1091 - PRODUCTNAME,  
1092 - </if>  
1093 - <if test="stowagedate != null">  
1094 - STOWAGEDATE,  
1095 - </if>  
1096 - <if test="customscode != null">  
1097 - CUSTOMSCODE,  
1098 - </if>  
1099 - <if test="shippername != null">  
1100 - SHIPPERNAME,  
1101 - </if>  
1102 - <if test="shippercity != null">  
1103 - SHIPPERCITY,  
1104 - </if>  
1105 - <if test="shipperaddress != null">  
1106 - SHIPPERADDRESS,  
1107 - </if>  
1108 - <if test="consigneename != null">  
1109 - CONSIGNEENAME,  
1110 - </if>  
1111 - <if test="consigneecity != null">  
1112 - CONSIGNEECITY,  
1113 - </if>  
1114 - <if test="consigneeaddress != null">  
1115 - CONSIGNEEADDRESS,  
1116 - </if>  
1117 - <if test="receiptinformation != null">  
1118 - RECEIPTINFORMATION,  
1119 - </if>  
1120 - <if test="agentcode != null">  
1121 - AGENTCODE,  
1122 - </if>  
1123 - <if test="agentname != null">  
1124 - AGENTNAME,  
1125 - </if>  
1126 - <if test="status != null">  
1127 - STATUS,  
1128 - </if>  
1129 - <if test="shipperCode != null">  
1130 - SHIPPER_CODE,  
1131 - </if>  
1132 - <if test="shipperCountrycode != null">  
1133 - SHIPPER_COUNTRYCODE,  
1134 - </if>  
1135 - <if test="shipperPhone != null">  
1136 - SHIPPER_PHONE,  
1137 - </if>  
1138 - <if test="shipperFax != null">  
1139 - SHIPPER_FAX,  
1140 - </if>  
1141 - <if test="consigneeCode != null">  
1142 - CONSIGNEE_CODE,  
1143 - </if>  
1144 - <if test="consigneeCountrycode != null">  
1145 - CONSIGNEE_COUNTRYCODE,  
1146 - </if>  
1147 - <if test="consigneePhone != null">  
1148 - CONSIGNEE_PHONE,  
1149 - </if>  
1150 - <if test="consigneeFax != null">  
1151 - CONSIGNEE_FAX,  
1152 - </if>  
1153 - <if test="shipperAeo != null">  
1154 - SHIPPER_AEO,  
1155 - </if>  
1156 - <if test="consigneeAeo != null">  
1157 - CONSIGNEE_AEO,  
1158 - </if>  
1159 - <if test="unloadingstation != null">  
1160 - UNLOADINGSTATION,  
1161 - </if>  
1162 - </trim>  
1163 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
1164 - <if test="autoid != null">  
1165 - #{autoid,jdbcType=VARCHAR},  
1166 - </if>  
1167 - <if test="waybillnomaster != null">  
1168 - #{waybillnomaster,jdbcType=VARCHAR},  
1169 - </if>  
1170 - <if test="waybillnosecondary != null">  
1171 - #{waybillnosecondary,jdbcType=VARCHAR},  
1172 - </if>  
1173 - <if test="totalweight != null">  
1174 - #{totalweight,jdbcType=VARCHAR},  
1175 - </if>  
1176 - <if test="totalpiece != null">  
1177 - #{totalpiece,jdbcType=VARCHAR},  
1178 - </if>  
1179 - <if test="preparepiece != null">  
1180 - #{preparepiece,jdbcType=VARCHAR},  
1181 - </if>  
1182 - <if test="prepareweight != null">  
1183 - #{prepareweight,jdbcType=VARCHAR},  
1184 - </if>  
1185 - <if test="createdate != null">  
1186 - #{createdate,jdbcType=TIMESTAMP},  
1187 - </if>  
1188 - <if test="preparemasterid != null">  
1189 - #{preparemasterid,jdbcType=VARCHAR},  
1190 - </if>  
1191 - <if test="carrier != null">  
1192 - #{carrier,jdbcType=VARCHAR},  
1193 - </if>  
1194 - <if test="flightno != null">  
1195 - #{flightno,jdbcType=VARCHAR},  
1196 - </if>  
1197 - <if test="flightdate != null">  
1198 - #{flightdate,jdbcType=TIMESTAMP},  
1199 - </if>  
1200 - <if test="originatingstation != null">  
1201 - #{originatingstation,jdbcType=VARCHAR},  
1202 - </if>  
1203 - <if test="destinationstation != null">  
1204 - #{destinationstation,jdbcType=VARCHAR},  
1205 - </if>  
1206 - <if test="customsstatus != null">  
1207 - #{customsstatus,jdbcType=VARCHAR},  
1208 - </if>  
1209 - <if test="paymode != null">  
1210 - #{paymode,jdbcType=VARCHAR},  
1211 - </if>  
1212 - <if test="productname != null">  
1213 - #{productname,jdbcType=VARCHAR},  
1214 - </if>  
1215 - <if test="stowagedate != null">  
1216 - #{stowagedate,jdbcType=TIMESTAMP},  
1217 - </if>  
1218 - <if test="customscode != null">  
1219 - #{customscode,jdbcType=VARCHAR},  
1220 - </if>  
1221 - <if test="shippername != null">  
1222 - #{shippername,jdbcType=VARCHAR},  
1223 - </if>  
1224 - <if test="shippercity != null">  
1225 - #{shippercity,jdbcType=VARCHAR},  
1226 - </if>  
1227 - <if test="shipperaddress != null">  
1228 - #{shipperaddress,jdbcType=VARCHAR},  
1229 - </if>  
1230 - <if test="consigneename != null">  
1231 - #{consigneename,jdbcType=VARCHAR},  
1232 - </if>  
1233 - <if test="consigneecity != null">  
1234 - #{consigneecity,jdbcType=VARCHAR},  
1235 - </if>  
1236 - <if test="consigneeaddress != null">  
1237 - #{consigneeaddress,jdbcType=VARCHAR},  
1238 - </if>  
1239 - <if test="receiptinformation != null">  
1240 - #{receiptinformation,jdbcType=VARCHAR},  
1241 - </if>  
1242 - <if test="agentcode != null">  
1243 - #{agentcode,jdbcType=VARCHAR},  
1244 - </if>  
1245 - <if test="agentname != null">  
1246 - #{agentname,jdbcType=VARCHAR},  
1247 - </if>  
1248 - <if test="status != null">  
1249 - #{status,jdbcType=VARCHAR},  
1250 - </if>  
1251 - <if test="shipperCode != null">  
1252 - #{shipperCode,jdbcType=VARCHAR},  
1253 - </if>  
1254 - <if test="shipperCountrycode != null">  
1255 - #{shipperCountrycode,jdbcType=VARCHAR},  
1256 - </if>  
1257 - <if test="shipperPhone != null">  
1258 - #{shipperPhone,jdbcType=VARCHAR},  
1259 - </if>  
1260 - <if test="shipperFax != null">  
1261 - #{shipperFax,jdbcType=VARCHAR},  
1262 - </if>  
1263 - <if test="consigneeCode != null">  
1264 - #{consigneeCode,jdbcType=VARCHAR},  
1265 - </if>  
1266 - <if test="consigneeCountrycode != null">  
1267 - #{consigneeCountrycode,jdbcType=VARCHAR},  
1268 - </if>  
1269 - <if test="consigneePhone != null">  
1270 - #{consigneePhone,jdbcType=VARCHAR},  
1271 - </if>  
1272 - <if test="consigneeFax != null">  
1273 - #{consigneeFax,jdbcType=VARCHAR},  
1274 - </if>  
1275 - <if test="shipperAeo != null">  
1276 - #{shipperAeo,jdbcType=VARCHAR},  
1277 - </if>  
1278 - <if test="consigneeAeo != null">  
1279 - #{consigneeAeo,jdbcType=VARCHAR},  
1280 - </if>  
1281 - <if test="unloadingstation != null">  
1282 - #{unloadingstation,jdbcType=VARCHAR},  
1283 - </if>  
1284 - </trim>  
1285 - </insert> 967 + <!--<resultMap id="BaseResultMap" type="com.tianbo.analysis.model.PREPARESECONDARY">-->
  968 + <!--<result column="AUTOID" jdbcType="VARCHAR" property="autoid" />-->
  969 + <!--<result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillnomaster" />-->
  970 + <!--<result column="WAYBILLNOSECONDARY" jdbcType="VARCHAR" property="waybillnosecondary" />-->
  971 + <!--<result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalweight" />-->
  972 + <!--<result column="TOTALPIECE" jdbcType="VARCHAR" property="totalpiece" />-->
  973 + <!--<result column="PREPAREPIECE" jdbcType="VARCHAR" property="preparepiece" />-->
  974 + <!--<result column="PREPAREWEIGHT" jdbcType="VARCHAR" property="prepareweight" />-->
  975 + <!--<result column="CREATEDATE" jdbcType="TIMESTAMP" property="createdate" />-->
  976 + <!--<result column="PREPAREMASTERID" jdbcType="VARCHAR" property="preparemasterid" />-->
  977 + <!--<result column="CARRIER" jdbcType="VARCHAR" property="carrier" />-->
  978 + <!--<result column="FLIGHTNO" jdbcType="VARCHAR" property="flightno" />-->
  979 + <!--<result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightdate" />-->
  980 + <!--<result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingstation" />-->
  981 + <!--<result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationstation" />-->
  982 + <!--<result column="CUSTOMSSTATUS" jdbcType="VARCHAR" property="customsstatus" />-->
  983 + <!--<result column="PAYMODE" jdbcType="VARCHAR" property="paymode" />-->
  984 + <!--<result column="PRODUCTNAME" jdbcType="VARCHAR" property="productname" />-->
  985 + <!--<result column="STOWAGEDATE" jdbcType="TIMESTAMP" property="stowagedate" />-->
  986 + <!--<result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customscode" />-->
  987 + <!--<result column="SHIPPERNAME" jdbcType="VARCHAR" property="shippername" />-->
  988 + <!--<result column="SHIPPERCITY" jdbcType="VARCHAR" property="shippercity" />-->
  989 + <!--<result column="SHIPPERADDRESS" jdbcType="VARCHAR" property="shipperaddress" />-->
  990 + <!--<result column="CONSIGNEENAME" jdbcType="VARCHAR" property="consigneename" />-->
  991 + <!--<result column="CONSIGNEECITY" jdbcType="VARCHAR" property="consigneecity" />-->
  992 + <!--<result column="CONSIGNEEADDRESS" jdbcType="VARCHAR" property="consigneeaddress" />-->
  993 + <!--<result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptinformation" />-->
  994 + <!--<result column="AGENTCODE" jdbcType="VARCHAR" property="agentcode" />-->
  995 + <!--<result column="AGENTNAME" jdbcType="VARCHAR" property="agentname" />-->
  996 + <!--<result column="STATUS" jdbcType="VARCHAR" property="status" />-->
  997 + <!--<result column="SHIPPER_CODE" jdbcType="VARCHAR" property="shipperCode" />-->
  998 + <!--<result column="SHIPPER_COUNTRYCODE" jdbcType="VARCHAR" property="shipperCountrycode" />-->
  999 + <!--<result column="SHIPPER_PHONE" jdbcType="VARCHAR" property="shipperPhone" />-->
  1000 + <!--<result column="SHIPPER_FAX" jdbcType="VARCHAR" property="shipperFax" />-->
  1001 + <!--<result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />-->
  1002 + <!--<result column="CONSIGNEE_COUNTRYCODE" jdbcType="VARCHAR" property="consigneeCountrycode" />-->
  1003 + <!--<result column="CONSIGNEE_PHONE" jdbcType="VARCHAR" property="consigneePhone" />-->
  1004 + <!--<result column="CONSIGNEE_FAX" jdbcType="VARCHAR" property="consigneeFax" />-->
  1005 + <!--<result column="SHIPPER_AEO" jdbcType="VARCHAR" property="shipperAeo" />-->
  1006 + <!--<result column="CONSIGNEE_AEO" jdbcType="VARCHAR" property="consigneeAeo" />-->
  1007 + <!--<result column="UNLOADINGSTATION" jdbcType="VARCHAR" property="unloadingstation" />-->
  1008 + <!--</resultMap>-->
  1009 + <!--<insert id="insert" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
  1010 + <!--insert into PREPARESECONDARY (AUTOID, WAYBILLNOMASTER, WAYBILLNOSECONDARY, -->
  1011 + <!--TOTALWEIGHT, TOTALPIECE, PREPAREPIECE, -->
  1012 + <!--PREPAREWEIGHT, CREATEDATE, PREPAREMASTERID, -->
  1013 + <!--CARRIER, FLIGHTNO, FLIGHTDATE, -->
  1014 + <!--ORIGINATINGSTATION, DESTINATIONSTATION, -->
  1015 + <!--CUSTOMSSTATUS, PAYMODE, PRODUCTNAME, -->
  1016 + <!--STOWAGEDATE, CUSTOMSCODE, SHIPPERNAME, -->
  1017 + <!--SHIPPERCITY, SHIPPERADDRESS, CONSIGNEENAME, -->
  1018 + <!--CONSIGNEECITY, CONSIGNEEADDRESS, RECEIPTINFORMATION, -->
  1019 + <!--AGENTCODE, AGENTNAME, STATUS, -->
  1020 + <!--SHIPPER_CODE, SHIPPER_COUNTRYCODE, SHIPPER_PHONE, -->
  1021 + <!--SHIPPER_FAX, CONSIGNEE_CODE, CONSIGNEE_COUNTRYCODE, -->
  1022 + <!--CONSIGNEE_PHONE, CONSIGNEE_FAX, SHIPPER_AEO, -->
  1023 + <!--CONSIGNEE_AEO, UNLOADINGSTATION)-->
  1024 + <!--values (#{autoid,jdbcType=VARCHAR}, #{waybillnomaster,jdbcType=VARCHAR}, #{waybillnosecondary,jdbcType=VARCHAR}, -->
  1025 + <!--#{totalweight,jdbcType=VARCHAR}, #{totalpiece,jdbcType=VARCHAR}, #{preparepiece,jdbcType=VARCHAR}, -->
  1026 + <!--#{prepareweight,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{preparemasterid,jdbcType=VARCHAR}, -->
  1027 + <!--#{carrier,jdbcType=VARCHAR}, #{flightno,jdbcType=VARCHAR}, #{flightdate,jdbcType=TIMESTAMP}, -->
  1028 + <!--#{originatingstation,jdbcType=VARCHAR}, #{destinationstation,jdbcType=VARCHAR}, -->
  1029 + <!--#{customsstatus,jdbcType=VARCHAR}, #{paymode,jdbcType=VARCHAR}, #{productname,jdbcType=VARCHAR}, -->
  1030 + <!--#{stowagedate,jdbcType=TIMESTAMP}, #{customscode,jdbcType=VARCHAR}, #{shippername,jdbcType=VARCHAR}, -->
  1031 + <!--#{shippercity,jdbcType=VARCHAR}, #{shipperaddress,jdbcType=VARCHAR}, #{consigneename,jdbcType=VARCHAR}, -->
  1032 + <!--#{consigneecity,jdbcType=VARCHAR}, #{consigneeaddress,jdbcType=VARCHAR}, #{receiptinformation,jdbcType=VARCHAR}, -->
  1033 + <!--#{agentcode,jdbcType=VARCHAR}, #{agentname,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, -->
  1034 + <!--#{shipperCode,jdbcType=VARCHAR}, #{shipperCountrycode,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, -->
  1035 + <!--#{shipperFax,jdbcType=VARCHAR}, #{consigneeCode,jdbcType=VARCHAR}, #{consigneeCountrycode,jdbcType=VARCHAR}, -->
  1036 + <!--#{consigneePhone,jdbcType=VARCHAR}, #{consigneeFax,jdbcType=VARCHAR}, #{shipperAeo,jdbcType=VARCHAR}, -->
  1037 + <!--#{consigneeAeo,jdbcType=VARCHAR}, #{unloadingstation,jdbcType=VARCHAR})-->
  1038 + <!--</insert>-->
  1039 + <!--<insert id="insertSelective" parameterType="com.tianbo.analysis.model.PREPARESECONDARY">-->
  1040 + <!--insert into PREPARESECONDARY-->
  1041 + <!--<trim prefix="(" suffix=")" suffixOverrides=",">-->
  1042 + <!--<if test="autoid != null">-->
  1043 + <!--AUTOID,-->
  1044 + <!--</if>-->
  1045 + <!--<if test="waybillnomaster != null">-->
  1046 + <!--WAYBILLNOMASTER,-->
  1047 + <!--</if>-->
  1048 + <!--<if test="waybillnosecondary != null">-->
  1049 + <!--WAYBILLNOSECONDARY,-->
  1050 + <!--</if>-->
  1051 + <!--<if test="totalweight != null">-->
  1052 + <!--TOTALWEIGHT,-->
  1053 + <!--</if>-->
  1054 + <!--<if test="totalpiece != null">-->
  1055 + <!--TOTALPIECE,-->
  1056 + <!--</if>-->
  1057 + <!--<if test="preparepiece != null">-->
  1058 + <!--PREPAREPIECE,-->
  1059 + <!--</if>-->
  1060 + <!--<if test="prepareweight != null">-->
  1061 + <!--PREPAREWEIGHT,-->
  1062 + <!--</if>-->
  1063 + <!--<if test="createdate != null">-->
  1064 + <!--CREATEDATE,-->
  1065 + <!--</if>-->
  1066 + <!--<if test="preparemasterid != null">-->
  1067 + <!--PREPAREMASTERID,-->
  1068 + <!--</if>-->
  1069 + <!--<if test="carrier != null">-->
  1070 + <!--CARRIER,-->
  1071 + <!--</if>-->
  1072 + <!--<if test="flightno != null">-->
  1073 + <!--FLIGHTNO,-->
  1074 + <!--</if>-->
  1075 + <!--<if test="flightdate != null">-->
  1076 + <!--FLIGHTDATE,-->
  1077 + <!--</if>-->
  1078 + <!--<if test="originatingstation != null">-->
  1079 + <!--ORIGINATINGSTATION,-->
  1080 + <!--</if>-->
  1081 + <!--<if test="destinationstation != null">-->
  1082 + <!--DESTINATIONSTATION,-->
  1083 + <!--</if>-->
  1084 + <!--<if test="customsstatus != null">-->
  1085 + <!--CUSTOMSSTATUS,-->
  1086 + <!--</if>-->
  1087 + <!--<if test="paymode != null">-->
  1088 + <!--PAYMODE,-->
  1089 + <!--</if>-->
  1090 + <!--<if test="productname != null">-->
  1091 + <!--PRODUCTNAME,-->
  1092 + <!--</if>-->
  1093 + <!--<if test="stowagedate != null">-->
  1094 + <!--STOWAGEDATE,-->
  1095 + <!--</if>-->
  1096 + <!--<if test="customscode != null">-->
  1097 + <!--CUSTOMSCODE,-->
  1098 + <!--</if>-->
  1099 + <!--<if test="shippername != null">-->
  1100 + <!--SHIPPERNAME,-->
  1101 + <!--</if>-->
  1102 + <!--<if test="shippercity != null">-->
  1103 + <!--SHIPPERCITY,-->
  1104 + <!--</if>-->
  1105 + <!--<if test="shipperaddress != null">-->
  1106 + <!--SHIPPERADDRESS,-->
  1107 + <!--</if>-->
  1108 + <!--<if test="consigneename != null">-->
  1109 + <!--CONSIGNEENAME,-->
  1110 + <!--</if>-->
  1111 + <!--<if test="consigneecity != null">-->
  1112 + <!--CONSIGNEECITY,-->
  1113 + <!--</if>-->
  1114 + <!--<if test="consigneeaddress != null">-->
  1115 + <!--CONSIGNEEADDRESS,-->
  1116 + <!--</if>-->
  1117 + <!--<if test="receiptinformation != null">-->
  1118 + <!--RECEIPTINFORMATION,-->
  1119 + <!--</if>-->
  1120 + <!--<if test="agentcode != null">-->
  1121 + <!--AGENTCODE,-->
  1122 + <!--</if>-->
  1123 + <!--<if test="agentname != null">-->
  1124 + <!--AGENTNAME,-->
  1125 + <!--</if>-->
  1126 + <!--<if test="status != null">-->
  1127 + <!--STATUS,-->
  1128 + <!--</if>-->
  1129 + <!--<if test="shipperCode != null">-->
  1130 + <!--SHIPPER_CODE,-->
  1131 + <!--</if>-->
  1132 + <!--<if test="shipperCountrycode != null">-->
  1133 + <!--SHIPPER_COUNTRYCODE,-->
  1134 + <!--</if>-->
  1135 + <!--<if test="shipperPhone != null">-->
  1136 + <!--SHIPPER_PHONE,-->
  1137 + <!--</if>-->
  1138 + <!--<if test="shipperFax != null">-->
  1139 + <!--SHIPPER_FAX,-->
  1140 + <!--</if>-->
  1141 + <!--<if test="consigneeCode != null">-->
  1142 + <!--CONSIGNEE_CODE,-->
  1143 + <!--</if>-->
  1144 + <!--<if test="consigneeCountrycode != null">-->
  1145 + <!--CONSIGNEE_COUNTRYCODE,-->
  1146 + <!--</if>-->
  1147 + <!--<if test="consigneePhone != null">-->
  1148 + <!--CONSIGNEE_PHONE,-->
  1149 + <!--</if>-->
  1150 + <!--<if test="consigneeFax != null">-->
  1151 + <!--CONSIGNEE_FAX,-->
  1152 + <!--</if>-->
  1153 + <!--<if test="shipperAeo != null">-->
  1154 + <!--SHIPPER_AEO,-->
  1155 + <!--</if>-->
  1156 + <!--<if test="consigneeAeo != null">-->
  1157 + <!--CONSIGNEE_AEO,-->
  1158 + <!--</if>-->
  1159 + <!--<if test="unloadingstation != null">-->
  1160 + <!--UNLOADINGSTATION,-->
  1161 + <!--</if>-->
  1162 + <!--</trim>-->
  1163 + <!--<trim prefix="values (" suffix=")" suffixOverrides=",">-->
  1164 + <!--<if test="autoid != null">-->
  1165 + <!--#{autoid,jdbcType=VARCHAR},-->
  1166 + <!--</if>-->
  1167 + <!--<if test="waybillnomaster != null">-->
  1168 + <!--#{waybillnomaster,jdbcType=VARCHAR},-->
  1169 + <!--</if>-->
  1170 + <!--<if test="waybillnosecondary != null">-->
  1171 + <!--#{waybillnosecondary,jdbcType=VARCHAR},-->
  1172 + <!--</if>-->
  1173 + <!--<if test="totalweight != null">-->
  1174 + <!--#{totalweight,jdbcType=VARCHAR},-->
  1175 + <!--</if>-->
  1176 + <!--<if test="totalpiece != null">-->
  1177 + <!--#{totalpiece,jdbcType=VARCHAR},-->
  1178 + <!--</if>-->
  1179 + <!--<if test="preparepiece != null">-->
  1180 + <!--#{preparepiece,jdbcType=VARCHAR},-->
  1181 + <!--</if>-->
  1182 + <!--<if test="prepareweight != null">-->
  1183 + <!--#{prepareweight,jdbcType=VARCHAR},-->
  1184 + <!--</if>-->
  1185 + <!--<if test="createdate != null">-->
  1186 + <!--#{createdate,jdbcType=TIMESTAMP},-->
  1187 + <!--</if>-->
  1188 + <!--<if test="preparemasterid != null">-->
  1189 + <!--#{preparemasterid,jdbcType=VARCHAR},-->
  1190 + <!--</if>-->
  1191 + <!--<if test="carrier != null">-->
  1192 + <!--#{carrier,jdbcType=VARCHAR},-->
  1193 + <!--</if>-->
  1194 + <!--<if test="flightno != null">-->
  1195 + <!--#{flightno,jdbcType=VARCHAR},-->
  1196 + <!--</if>-->
  1197 + <!--<if test="flightdate != null">-->
  1198 + <!--#{flightdate,jdbcType=TIMESTAMP},-->
  1199 + <!--</if>-->
  1200 + <!--<if test="originatingstation != null">-->
  1201 + <!--#{originatingstation,jdbcType=VARCHAR},-->
  1202 + <!--</if>-->
  1203 + <!--<if test="destinationstation != null">-->
  1204 + <!--#{destinationstation,jdbcType=VARCHAR},-->
  1205 + <!--</if>-->
  1206 + <!--<if test="customsstatus != null">-->
  1207 + <!--#{customsstatus,jdbcType=VARCHAR},-->
  1208 + <!--</if>-->
  1209 + <!--<if test="paymode != null">-->
  1210 + <!--#{paymode,jdbcType=VARCHAR},-->
  1211 + <!--</if>-->
  1212 + <!--<if test="productname != null">-->
  1213 + <!--#{productname,jdbcType=VARCHAR},-->
  1214 + <!--</if>-->
  1215 + <!--<if test="stowagedate != null">-->
  1216 + <!--#{stowagedate,jdbcType=TIMESTAMP},-->
  1217 + <!--</if>-->
  1218 + <!--<if test="customscode != null">-->
  1219 + <!--#{customscode,jdbcType=VARCHAR},-->
  1220 + <!--</if>-->
  1221 + <!--<if test="shippername != null">-->
  1222 + <!--#{shippername,jdbcType=VARCHAR},-->
  1223 + <!--</if>-->
  1224 + <!--<if test="shippercity != null">-->
  1225 + <!--#{shippercity,jdbcType=VARCHAR},-->
  1226 + <!--</if>-->
  1227 + <!--<if test="shipperaddress != null">-->
  1228 + <!--#{shipperaddress,jdbcType=VARCHAR},-->
  1229 + <!--</if>-->
  1230 + <!--<if test="consigneename != null">-->
  1231 + <!--#{consigneename,jdbcType=VARCHAR},-->
  1232 + <!--</if>-->
  1233 + <!--<if test="consigneecity != null">-->
  1234 + <!--#{consigneecity,jdbcType=VARCHAR},-->
  1235 + <!--</if>-->
  1236 + <!--<if test="consigneeaddress != null">-->
  1237 + <!--#{consigneeaddress,jdbcType=VARCHAR},-->
  1238 + <!--</if>-->
  1239 + <!--<if test="receiptinformation != null">-->
  1240 + <!--#{receiptinformation,jdbcType=VARCHAR},-->
  1241 + <!--</if>-->
  1242 + <!--<if test="agentcode != null">-->
  1243 + <!--#{agentcode,jdbcType=VARCHAR},-->
  1244 + <!--</if>-->
  1245 + <!--<if test="agentname != null">-->
  1246 + <!--#{agentname,jdbcType=VARCHAR},-->
  1247 + <!--</if>-->
  1248 + <!--<if test="status != null">-->
  1249 + <!--#{status,jdbcType=VARCHAR},-->
  1250 + <!--</if>-->
  1251 + <!--<if test="shipperCode != null">-->
  1252 + <!--#{shipperCode,jdbcType=VARCHAR},-->
  1253 + <!--</if>-->
  1254 + <!--<if test="shipperCountrycode != null">-->
  1255 + <!--#{shipperCountrycode,jdbcType=VARCHAR},-->
  1256 + <!--</if>-->
  1257 + <!--<if test="shipperPhone != null">-->
  1258 + <!--#{shipperPhone,jdbcType=VARCHAR},-->
  1259 + <!--</if>-->
  1260 + <!--<if test="shipperFax != null">-->
  1261 + <!--#{shipperFax,jdbcType=VARCHAR},-->
  1262 + <!--</if>-->
  1263 + <!--<if test="consigneeCode != null">-->
  1264 + <!--#{consigneeCode,jdbcType=VARCHAR},-->
  1265 + <!--</if>-->
  1266 + <!--<if test="consigneeCountrycode != null">-->
  1267 + <!--#{consigneeCountrycode,jdbcType=VARCHAR},-->
  1268 + <!--</if>-->
  1269 + <!--<if test="consigneePhone != null">-->
  1270 + <!--#{consigneePhone,jdbcType=VARCHAR},-->
  1271 + <!--</if>-->
  1272 + <!--<if test="consigneeFax != null">-->
  1273 + <!--#{consigneeFax,jdbcType=VARCHAR},-->
  1274 + <!--</if>-->
  1275 + <!--<if test="shipperAeo != null">-->
  1276 + <!--#{shipperAeo,jdbcType=VARCHAR},-->
  1277 + <!--</if>-->
  1278 + <!--<if test="consigneeAeo != null">-->
  1279 + <!--#{consigneeAeo,jdbcType=VARCHAR},-->
  1280 + <!--</if>-->
  1281 + <!--<if test="unloadingstation != null">-->
  1282 + <!--#{unloadingstation,jdbcType=VARCHAR},-->
  1283 + <!--</if>-->
  1284 + <!--</trim>-->
  1285 + <!--</insert>-->
1286 1286
1287 1287
1288 <update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" > 1288 <update id="updateRECEIPTION" parameterType="com.tianbo.analysis.model.PREPARESECONDARY" >