wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 3a8d0059c087aa2fb19364f310754ec980969c67 1 个父辈 03516d9f

生成报文 主单号带 - 问题

内嵌 并排对比
正在显示 28 个修改的文件 包含 113 行增加 和 37 行删除
@@ -58,6 +58,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{ @@ -58,6 +58,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
58 map.put("sendTime", DateUtil.getCurrentTime17()); 58 map.put("sendTime", DateUtil.getCurrentTime17());
59 // 舱单传输人名称 59 // 舱单传输人名称
60 map.put("orgCode", orgCode); 60 map.put("orgCode", orgCode);
  61 +
  62 + // 处理主单号 -
  63 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  64 + map.put("awbas", awba);
  65 +
61 // 生成报文 66 // 生成报文
62 Map<String, Object> hashMap = new HashMap<>(); 67 Map<String, Object> hashMap = new HashMap<>();
63 // 生成报文 68 // 生成报文
@@ -101,6 +106,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{ @@ -101,6 +106,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
101 // 封装实体 106 // 封装实体
102 map.put("mt", customMt1201); 107 map.put("mt", customMt1201);
103 map.put("awbAwbinfo", awbAwbinfo); 108 map.put("awbAwbinfo", awbAwbinfo);
  109 +
  110 + // 处理主单号-
  111 + String awba = ReturnUtil.awbaReplace(customMt1201.getAwba());
  112 + map.put("awba", awba);
  113 +
104 // 生成报文头部 114 // 生成报文头部
105 String msgId = makeMsgID("MT1201", orgsn, customMt1201.getAwba()); 115 String msgId = makeMsgID("MT1201", orgsn, customMt1201.getAwba());
106 String senderId = makeSenderID(customCode, orgsn, ""); 116 String senderId = makeSenderID(customCode, orgsn, "");
@@ -89,7 +89,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service { @@ -89,7 +89,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
89 map.put("sendTime", DateUtil.getCurrentTime17()); 89 map.put("sendTime", DateUtil.getCurrentTime17());
90 // 舱单传输人名称 90 // 舱单传输人名称
91 map.put("orgCode", orgCode); 91 map.put("orgCode", orgCode);
92 - 92 + // 处理主单号-
  93 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  94 + map.put("awbas", awba);
93 Map<String, Object> hashMap = new HashMap<>(); 95 Map<String, Object> hashMap = new HashMap<>();
94 // 生成报文 96 // 生成报文
95 if (makeXmlToFile("/remove/MT2201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 97 if (makeXmlToFile("/remove/MT2201.ftlx", msgId+".xml", map, "./send/remove/")>0){
@@ -124,6 +126,11 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service { @@ -124,6 +126,11 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
124 // 封装实体 126 // 封装实体
125 map.put("mt", custom_mt2201); 127 map.put("mt", custom_mt2201);
126 map.put("awbAwbinfo", awbAwbinfo); 128 map.put("awbAwbinfo", awbAwbinfo);
  129 +
  130 + // 处理主单号-
  131 + String awba = ReturnUtil.awbaReplace(custom_mt2201.getAwba());
  132 + map.put("awba", awba);
  133 +
127 // 生成报文头部 134 // 生成报文头部
128 String msgId = makeMsgID("MT2201", orgsn, custom_mt2201.getAwba()); 135 String msgId = makeMsgID("MT2201", orgsn, custom_mt2201.getAwba());
129 String senderId = makeSenderID(customCode, orgsn, ""); 136 String senderId = makeSenderID(customCode, orgsn, "");
@@ -35,6 +35,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service { @@ -35,6 +35,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
35 String customCode = customMt3201.getCustomcode(); 35 String customCode = customMt3201.getCustomcode();
36 // 报文头时间 精确到毫秒 36 // 报文头时间 精确到毫秒
37 map.put("sendTime", DateUtil.getCurrentTime17()); 37 map.put("sendTime", DateUtil.getCurrentTime17());
  38 +
  39 + String awba = ReturnUtil.awbaReplace(customMt3201.getAwba());
  40 + map.put("awba", awba);
38 // 封装实体 41 // 封装实体
39 map.put("mt", customMt3201); 42 map.put("mt", customMt3201);
40 // 生成报文头部 43 // 生成报文头部
@@ -97,6 +100,10 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service { @@ -97,6 +100,10 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
97 map.put("msgId", msgId); 100 map.put("msgId", msgId);
98 map.put("senderId", senderId); 101 map.put("senderId", senderId);
99 map.put("receiverID", receiverID); 102 map.put("receiverID", receiverID);
  103 +
  104 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  105 + map.put("awbas", awba);
  106 +
100 Map<String, Object> map3201 = new HashMap<>(); 107 Map<String, Object> map3201 = new HashMap<>();
101 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){ 108 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){
102 map.put("functionCode", "3"); 109 map.put("functionCode", "3");
@@ -34,6 +34,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service { @@ -34,6 +34,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
34 map.put("sendTime", DateUtil.getCurrentTime17()); 34 map.put("sendTime", DateUtil.getCurrentTime17());
35 // 封装实体 35 // 封装实体
36 map.put("mt", nmmsCustomTrans); 36 map.put("mt", nmmsCustomTrans);
  37 +
  38 + // 处理主单号 -
  39 + String awba = ReturnUtil.awbaReplace(nmmsCustomTrans.getAwba());
  40 + map.put("awba", awba);
  41 +
37 // 生成报文头部 42 // 生成报文头部
38 String msgId = makeMsgID("MT3202", orgsn, nmmsCustomTrans.getAwba()); 43 String msgId = makeMsgID("MT3202", orgsn, nmmsCustomTrans.getAwba());
39 String msessageType = "MT3202"; 44 String msessageType = "MT3202";
@@ -89,6 +94,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service { @@ -89,6 +94,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
89 map.put("msgId", msgId); 94 map.put("msgId", msgId);
90 map.put("senderId", senderId); 95 map.put("senderId", senderId);
91 map.put("receiverID", receiverID); 96 map.put("receiverID", receiverID);
  97 +
  98 + // 处理主单号 -
  99 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  100 + map.put("awbas", awba);
  101 +
92 Map<String, Object> map3201 = new HashMap<>(); 102 Map<String, Object> map3201 = new HashMap<>();
93 if (makeXmlToFile("/remove/MT3202.ftlx", msgId+".xml", map,"./send/remove/")>0){ 103 if (makeXmlToFile("/remove/MT3202.ftlx", msgId+".xml", map,"./send/remove/")>0){
94 map.put("functionCode", "3"); 104 map.put("functionCode", "3");
@@ -37,7 +37,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service { @@ -37,7 +37,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
37 map.put("sendTime", DateUtil.getCurrentTime17()); 37 map.put("sendTime", DateUtil.getCurrentTime17());
38 // 封装实体 38 // 封装实体
39 map.put("mt", customMt4201); 39 map.put("mt", customMt4201);
40 - 40 + // 处理主单号 -
  41 + String awba = ReturnUtil.awbaReplace(customMt4201.getAwba());
  42 + map.put("awba", awba);
41 // 生成报文头部 43 // 生成报文头部
42 String msgId = makeMsgID("MT4201", orgsn, customMt4201.getAwba()); 44 String msgId = makeMsgID("MT4201", orgsn, customMt4201.getAwba());
43 String senderId = makeSenderID(customCode, orgsn); 45 String senderId = makeSenderID(customCode, orgsn);
@@ -99,6 +101,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service { @@ -99,6 +101,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
99 map.put("msgId", msgId); 101 map.put("msgId", msgId);
100 map.put("senderId", senderId); 102 map.put("senderId", senderId);
101 map.put("receiverID", receiverID); 103 map.put("receiverID", receiverID);
  104 + // 处理主单号 -
  105 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  106 + map.put("awbas", awba);
102 Map<String, Object> map4201 = new HashMap<>(); 107 Map<String, Object> map4201 = new HashMap<>();
103 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 108 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){
104 map.put("functionCode", "3"); 109 map.put("functionCode", "3");
@@ -34,12 +34,16 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -34,12 +34,16 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
34 34
35 Map<String, Object> hashMap = new HashMap(); 35 Map<String, Object> hashMap = new HashMap();
36 36
  37 + // 处理主单号-
  38 + String awba = ReturnUtil.awbaReplace(customMt520X.getAwba());
  39 + hashMap.put("awba", awba);
37 // 关区代码 40 // 关区代码
38 String customCode = customMt520X.getCustomcode(); 41 String customCode = customMt520X.getCustomcode();
39 // 报文头时间 精确到毫秒 42 // 报文头时间 精确到毫秒
40 hashMap.put("sendTime", DateUtil.getCurrentTime17()); 43 hashMap.put("sendTime", DateUtil.getCurrentTime17());
41 // 封装实体 44 // 封装实体
42 hashMap.put("mt", customMt520X); 45 hashMap.put("mt", customMt520X);
  46 +
43 hashMap.put("orgCode", orgCode); 47 hashMap.put("orgCode", orgCode);
44 if ("MT5201".equals(customMt520X.getRcfdep())){ 48 if ("MT5201".equals(customMt520X.getRcfdep())){
45 // 生成报文头部 49 // 生成报文头部
@@ -51,6 +55,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -51,6 +55,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
51 hashMap.put("msessageType", msessageType); 55 hashMap.put("msessageType", msessageType);
52 hashMap.put("senderId", senderId); 56 hashMap.put("senderId", senderId);
53 hashMap.put("receiverID", receiverID); 57 hashMap.put("receiverID", receiverID);
  58 +
54 Map<String, Object> maps = new HashMap<>(); 59 Map<String, Object> maps = new HashMap<>();
55 if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){ 60 if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){
56 61
@@ -143,6 +148,11 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -143,6 +148,11 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
143 map.put("customCode", customCode); 148 map.put("customCode", customCode);
144 // 报文头时间 精确到毫秒 149 // 报文头时间 精确到毫秒
145 map.put("sendTime", DateUtil.getCurrentTime17()); 150 map.put("sendTime", DateUtil.getCurrentTime17());
  151 +
  152 + // 处理主单号-
  153 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  154 + map.put("awbas", awba);
  155 +
146 if ("MT5201".equals(map.get("rcfdep").toString())){ 156 if ("MT5201".equals(map.get("rcfdep").toString())){
147 // 生成报文头部 157 // 生成报文头部
148 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString()); 158 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString());
@@ -33,6 +33,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{ @@ -33,6 +33,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
33 map.put("sendTime", DateUtil.getCurrentTime17()); 33 map.put("sendTime", DateUtil.getCurrentTime17());
34 // 封装实体 34 // 封装实体
35 map.put("mt", nmmsCustomTrans); 35 map.put("mt", nmmsCustomTrans);
  36 +
  37 + // 处理主单号 -
  38 + String awba = ReturnUtil.awbaReplace(nmmsCustomTrans.getAwba());
  39 + map.put("awba", awba);
  40 +
36 // 生成报文头部 41 // 生成报文头部
37 String msgId = makeMsgID("MT6202", orgsn, nmmsCustomTrans.getAwba()); 42 String msgId = makeMsgID("MT6202", orgsn, nmmsCustomTrans.getAwba());
38 String msessageType = "MT6202"; 43 String msessageType = "MT6202";
@@ -88,6 +93,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{ @@ -88,6 +93,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
88 map.put("msgId", msgId); 93 map.put("msgId", msgId);
89 map.put("senderId", senderId); 94 map.put("senderId", senderId);
90 map.put("receiverID", receiverID); 95 map.put("receiverID", receiverID);
  96 +
  97 + // 处理主单号 -
  98 + String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
  99 + map.put("awbas", awba);
  100 +
91 Map<String, Object> map3201 = new HashMap<>(); 101 Map<String, Object> map3201 = new HashMap<>();
92 if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){ 102 if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){
93 map.put("functionCode", "3"); 103 map.put("functionCode", "3");
@@ -46,6 +46,15 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service { @@ -46,6 +46,15 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
46 map.put("mt1201", customMt1201); 46 map.put("mt1201", customMt1201);
47 map.put("mt2201", customMt2201); 47 map.put("mt2201", customMt2201);
48 map.put("orgCode", orgCode); 48 map.put("orgCode", orgCode);
  49 +
  50 + // 处理主单号 -
  51 + String mt1201 = ReturnUtil.awbaReplace(customMt1201.getAwba());
  52 + map.put("mt1201", mt1201);
  53 +
  54 + // 处理主单号 -
  55 + String mt2201 = ReturnUtil.awbaReplace(customMt2201.getAwba());
  56 + map.put("mt2201", mt2201);
  57 +
49 // 生成报文头部 58 // 生成报文头部
50 String msgId = makeMsgID("MT8205", orgsn, customMt1201.getAwba()); 59 String msgId = makeMsgID("MT8205", orgsn, customMt1201.getAwba());
51 String msessageType = "MT8205"; 60 String msessageType = "MT8205";
@@ -89,6 +89,14 @@ public class ReturnUtil { @@ -89,6 +89,14 @@ public class ReturnUtil {
89 return nmmsCustomResponse; 89 return nmmsCustomResponse;
90 } 90 }
91 91
  92 + /**
  93 + * 替换主单号带-
  94 + * @param awba
  95 + * @return
  96 + */
  97 + public static String awbaReplace(String awba){
92 98
  99 + return awba.replace("-","");
  100 + }
93 101
94 } 102 }
@@ -27,14 +27,14 @@ @@ -27,14 +27,14 @@
27 </BorderTransportMeans> 27 </BorderTransportMeans>
28 <Consignment> 28 <Consignment>
29 <TransportContractDocument> 29 <TransportContractDocument>
30 - <ID>${mt.awba}</ID> 30 + <ID>${awba}</ID>
31 <ChangeReasonCode>999</ChangeReasonCode> 31 <ChangeReasonCode>999</ChangeReasonCode>
32 <ConditionCode>10</ConditionCode> 32 <ConditionCode>10</ConditionCode>
33 </TransportContractDocument> 33 </TransportContractDocument>
34 <#if mt['awbh']??> 34 <#if mt['awbh']??>
35 <#if mt.awbh?default("")?length gt 1> 35 <#if mt.awbh?default("")?length gt 1>
36 <AssociatedTransportDocument> 36 <AssociatedTransportDocument>
37 - <ID>${mt.awba}_${mt.awbh}</ID> 37 + <ID>${awba}_${mt.awbh}</ID>
38 </AssociatedTransportDocument> 38 </AssociatedTransportDocument>
39 </#if> 39 </#if>
40 </#if> 40 </#if>
@@ -25,14 +25,14 @@ @@ -25,14 +25,14 @@
25 </BorderTransportMeans> 25 </BorderTransportMeans>
26 <Consignment> 26 <Consignment>
27 <TransportContractDocument> 27 <TransportContractDocument>
28 - <ID>${mt.awba}</ID> 28 + <ID>${awba}</ID>
29 <ChangeReasonCode>9999</ChangeReasonCode> 29 <ChangeReasonCode>9999</ChangeReasonCode>
30 <ConditionCode>10</ConditionCode> 30 <ConditionCode>10</ConditionCode>
31 </TransportContractDocument> 31 </TransportContractDocument>
32 <#if mt['awbh']??> 32 <#if mt['awbh']??>
33 <#if mt.awbh?default("")?length gt 1> 33 <#if mt.awbh?default("")?length gt 1>
34 <AssociatedTransportDocument> 34 <AssociatedTransportDocument>
35 - <ID>${mt.awba}_${mt.awbh}</ID> 35 + <ID>${awba}_${mt.awbh}</ID>
36 </AssociatedTransportDocument> 36 </AssociatedTransportDocument>
37 </#if> 37 </#if>
38 </#if> 38 </#if>
@@ -27,13 +27,13 @@ @@ -27,13 +27,13 @@
27 </BorderTransportMeans> 27 </BorderTransportMeans>
28 <Consignment> 28 <Consignment>
29 <TransportContractDocument> 29 <TransportContractDocument>
30 - <ID>${mt.awba}</ID> 30 + <ID>${awba}</ID>
31 <ConditionCode>10</ConditionCode> 31 <ConditionCode>10</ConditionCode>
32 </TransportContractDocument> 32 </TransportContractDocument>
33 <#if mt['awbh']??> 33 <#if mt['awbh']??>
34 <#if mt.awbh?default("")?length gt 1> 34 <#if mt.awbh?default("")?length gt 1>
35 <AssociatedTransportDocument> 35 <AssociatedTransportDocument>
36 - <ID>${mt.awba}_${mt.awbh}</ID> 36 + <ID>${awba}_${mt.awbh}</ID>
37 </AssociatedTransportDocument> 37 </AssociatedTransportDocument>
38 </#if> 38 </#if>
39 </#if> 39 </#if>
@@ -24,13 +24,13 @@ @@ -24,13 +24,13 @@
24 </BorderTransportMeans> 24 </BorderTransportMeans>
25 <Consignment> 25 <Consignment>
26 <TransportContractDocument> 26 <TransportContractDocument>
27 - <ID>${mt.awba}</ID> 27 + <ID>${awba}</ID>
28 <ConditionCode>10</ConditionCode> 28 <ConditionCode>10</ConditionCode>
29 </TransportContractDocument> 29 </TransportContractDocument>
30 <#if mt['awbh']??> 30 <#if mt['awbh']??>
31 <#if mt.awbh?default("")?length gt 1> 31 <#if mt.awbh?default("")?length gt 1>
32 <AssociatedTransportDocument> 32 <AssociatedTransportDocument>
33 - <ID>${mt.awba}_${mt.awbh}</ID> 33 + <ID>${awba}_${mt.awbh}</ID>
34 </AssociatedTransportDocument> 34 </AssociatedTransportDocument>
35 </#if> 35 </#if>
36 </#if> 36 </#if>
@@ -18,16 +18,16 @@ @@ -18,16 +18,16 @@
18 </BorderTransportMeans> 18 </BorderTransportMeans>
19 <UnloadingLocation> 19 <UnloadingLocation>
20 <ID>${mt.destinationstation}/${mt.customcode}</ID> 20 <ID>${mt.destinationstation}/${mt.customcode}</ID>
21 - <ArrivalDate>${mt.arrivetime?string('yyyyMMddHHmmss')}</ArrivalDate> 21 + <ArrivalDate>${mt.arrivetime?string("yyyyMMdd")}</ArrivalDate>
22 </UnloadingLocation> 22 </UnloadingLocation>
23 <Consignment> 23 <Consignment>
24 <TransportContractDocument> 24 <TransportContractDocument>
25 - <ID>${mt.awba}</ID> 25 + <ID>${awba}</ID>
26 </TransportContractDocument> 26 </TransportContractDocument>
27 <#if mt['awbh']??> 27 <#if mt['awbh']??>
28 <#if mt.awbh?default("")?length gt 1> 28 <#if mt.awbh?default("")?length gt 1>
29 <AssociatedTransportDocument> 29 <AssociatedTransportDocument>
30 - <ID>${mt.awba}_${mt.awbh}</ID> 30 + <ID>${awba}_${mt.awbh}</ID>
31 </AssociatedTransportDocument> 31 </AssociatedTransportDocument>
32 </#if> 32 </#if>
33 </#if> 33 </#if>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </UnloadingLocation> 21 </UnloadingLocation>
22 <Consignment> 22 <Consignment>
23 <TransportContractDocument> 23 <TransportContractDocument>
24 - <ID>${mt.awba}</ID> 24 + <ID>${awba}</ID>
25 </TransportContractDocument> 25 </TransportContractDocument>
26 <ConsignmentPackaging> 26 <ConsignmentPackaging>
27 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity> 27 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
@@ -20,12 +20,12 @@ @@ -20,12 +20,12 @@
20 </BorderTransportMeans> 20 </BorderTransportMeans>
21 <Consignment> 21 <Consignment>
22 <TransportContractDocument> 22 <TransportContractDocument>
23 - <ID>${mt.awba}</ID> 23 + <ID>${awba}</ID>
24 </TransportContractDocument> 24 </TransportContractDocument>
25 <#if mt['awbh']??> 25 <#if mt['awbh']??>
26 <#if mt.awbh?default("")?length gt 1> 26 <#if mt.awbh?default("")?length gt 1>
27 <AssociatedTransportDocument> 27 <AssociatedTransportDocument>
28 - <ID>${mt.awba}_${mt.awbh}</ID> 28 + <ID>${awba}_${mt.awbh}</ID>
29 </AssociatedTransportDocument> 29 </AssociatedTransportDocument>
30 </#if> 30 </#if>
31 </#if> 31 </#if>
@@ -26,12 +26,12 @@ @@ -26,12 +26,12 @@
26 </TallyParty> 26 </TallyParty>
27 <Consignment> 27 <Consignment>
28 <TransportContractDocument> 28 <TransportContractDocument>
29 - <ID>${mt.awba}</ID> 29 + <ID>${awba}</ID>
30 </TransportContractDocument> 30 </TransportContractDocument>
31 <#if mt['awbh']??> 31 <#if mt['awbh']??>
32 <#if mt.awbh?default("")?length gt 1> 32 <#if mt.awbh?default("")?length gt 1>
33 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
34 - <ID>${mt.awba}_${mt.awbh}</ID> 34 + <ID>${awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
36 </#if> 36 </#if>
37 </#if> 37 </#if>
@@ -26,12 +26,12 @@ @@ -26,12 +26,12 @@
26 </TallyParty> 26 </TallyParty>
27 <Consignment> 27 <Consignment>
28 <TransportContractDocument> 28 <TransportContractDocument>
29 - <ID>${mt.awba}</ID> 29 + <ID>${awba}</ID>
30 </TransportContractDocument> 30 </TransportContractDocument>
31 <#if mt['awbh']??> 31 <#if mt['awbh']??>
32 <#if mt.awbh?default("")?length gt 11> 32 <#if mt.awbh?default("")?length gt 11>
33 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
34 - <ID>${mt.awba}_${mt.awbh}</ID> 34 + <ID>${awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
36 </#if> 36 </#if>
37 </#if> 37 </#if>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </BorderTransportMeans> 20 </BorderTransportMeans>
21 <Consignment> 21 <Consignment>
22 <TransportContractDocument> 22 <TransportContractDocument>
23 - <ID>${mt.awba}</ID> 23 + <ID>${awba}</ID>
24 </TransportContractDocument> 24 </TransportContractDocument>
25 <ConsignmentPackaging> 25 <ConsignmentPackaging>
26 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity> 26 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </BorderTransportMeans> 20 </BorderTransportMeans>
21 <Consignment> 21 <Consignment>
22 <TransportContractDocument> 22 <TransportContractDocument>
23 - <ID>${mt1201.awba}</ID> 23 + <ID>${mt1201awba}</ID>
24 </TransportContractDocument> 24 </TransportContractDocument>
25 <LoadingLocation> 25 <LoadingLocation>
26 <ID>${mt8205.awboriginstation}</ID> 26 <ID>${mt8205.awboriginstation}</ID>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </BorderTransportMeans> 46 </BorderTransportMeans>
47 <Consignment> 47 <Consignment>
48 <TransportContractDocument> 48 <TransportContractDocument>
49 - <ID>${mt2201.awba}</ID> 49 + <ID>${mt2201awba}</ID>
50 </TransportContractDocument> 50 </TransportContractDocument>
51 <UnloadingLocation> 51 <UnloadingLocation>
52 <ID>${mt8205.awbdesstation}</ID> 52 <ID>${mt8205.awbdesstation}</ID>
@@ -17,12 +17,12 @@ @@ -17,12 +17,12 @@
17 </BorderTransportMeans> 17 </BorderTransportMeans>
18 <Consignment> 18 <Consignment>
19 <TransportContractDocument> 19 <TransportContractDocument>
20 - <ID>${awba}</ID> 20 + <ID>${awbas}</ID>
21 <ChangeReasonCode>999</ChangeReasonCode> 21 <ChangeReasonCode>999</ChangeReasonCode>
22 </TransportContractDocument> 22 </TransportContractDocument>
23 <#if awbh?default("")?length gt 1> 23 <#if awbh?default("")?length gt 1>
24 <AssociatedTransportDocument> 24 <AssociatedTransportDocument>
25 - <ID>${awba}_${awbh}</ID> 25 + <ID>${awbas}_${awbh}</ID>
26 </AssociatedTransportDocument> 26 </AssociatedTransportDocument>
27 </#if> 27 </#if>
28 </Consignment> 28 </Consignment>
@@ -18,12 +18,12 @@ @@ -18,12 +18,12 @@
18 </BorderTransportMeans> 18 </BorderTransportMeans>
19 <Consignment> 19 <Consignment>
20 <TransportContractDocument> 20 <TransportContractDocument>
21 - <ID>${awba}</ID> 21 + <ID>${awbas}</ID>
22 <ChangeReasonCode>9999</ChangeReasonCode> 22 <ChangeReasonCode>9999</ChangeReasonCode>
23 </TransportContractDocument> 23 </TransportContractDocument>
24 <#if awbh?default("")?length gt 1> 24 <#if awbh?default("")?length gt 1>
25 <AssociatedTransportDocument> 25 <AssociatedTransportDocument>
26 - <ID>${awba}_${awbh}</ID> 26 + <ID>${awbas}_${awbh}</ID>
27 </AssociatedTransportDocument> 27 </AssociatedTransportDocument>
28 </#if> 28 </#if>
29 </Consignment> 29 </Consignment>
@@ -15,11 +15,11 @@ @@ -15,11 +15,11 @@
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
18 - <ID>${awba}</ID> 18 + <ID>${awbas}</ID>
19 </TransportContractDocument> 19 </TransportContractDocument>
20 <#if awbh?default("")?length gt 1> 20 <#if awbh?default("")?length gt 1>
21 <AssociatedTransportDocument> 21 <AssociatedTransportDocument>
22 - <ID>${awba}_${awbh}</ID> 22 + <ID>${awbas}_${awbh}</ID>
23 </AssociatedTransportDocument> 23 </AssociatedTransportDocument>
24 </#if> 24 </#if>
25 </Consignment> 25 </Consignment>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
17 - <ID>${awba}</ID> 17 + <ID>${awbas}</ID>
18 </TransportContractDocument> 18 </TransportContractDocument>
19 </Consignment> 19 </Consignment>
20 <AdditionalInformation> 20 <AdditionalInformation>
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
17 - <ID>${awba}</ID> 17 + <ID>${awbas}</ID>
18 </TransportContractDocument> 18 </TransportContractDocument>
19 <#if awbh?default("")?length gt 1> 19 <#if awbh?default("")?length gt 1>
20 <AssociatedTransportDocument> 20 <AssociatedTransportDocument>
21 - <ID>${awba}_${awbh}</ID> 21 + <ID>${awbas}_${awbh}</ID>
22 </AssociatedTransportDocument> 22 </AssociatedTransportDocument>
23 </#if> 23 </#if>
24 </Consignment> 24 </Consignment>
@@ -15,11 +15,11 @@ @@ -15,11 +15,11 @@
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
18 - <ID>${awba}</ID> 18 + <ID>${awbas}</ID>
19 </TransportContractDocument> 19 </TransportContractDocument>
20 <#if awbh?default("")?length gt 1> 20 <#if awbh?default("")?length gt 1>
21 <AssociatedTransportDocument> 21 <AssociatedTransportDocument>
22 - <ID>${awba}_${awbh}</ID> 22 + <ID>${awbas}_${awbh}</ID>
23 </AssociatedTransportDocument> 23 </AssociatedTransportDocument>
24 </#if> 24 </#if>
25 </Consignment> 25 </Consignment>
@@ -15,11 +15,11 @@ @@ -15,11 +15,11 @@
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
18 - <ID>${awba}</ID> 18 + <ID>${awbas}</ID>
19 </TransportContractDocument> 19 </TransportContractDocument>
20 <#if awbh?default("")?length gt 1> 20 <#if awbh?default("")?length gt 1>
21 <AssociatedTransportDocument> 21 <AssociatedTransportDocument>
22 - <ID>${awba}_${awbh}</ID> 22 + <ID>${awbas}_${awbh}</ID>
23 </AssociatedTransportDocument> 23 </AssociatedTransportDocument>
24 </#if> 24 </#if>
25 </Consignment> 25 </Consignment>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
17 - <ID>${awba}</ID> 17 + <ID>${awbas}</ID>
18 </TransportContractDocument> 18 </TransportContractDocument>
19 </Consignment> 19 </Consignment>
20 <AdditionalInformation> 20 <AdditionalInformation>