wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 b65f513367cb7ece4ddcdb6fce2a173c75b1152b 1 个父辈 a346c24d

1201 新增 修改 删除 修改 5202模板 判断key 删除所有mesageType 模板定义

内嵌 并排对比
正在显示 23 个修改的文件 包含 297 行增加 和 119 行删除
@@ -2,10 +2,7 @@ package com.sunyo.wlpt.message.builder.controller; @@ -2,10 +2,7 @@ package com.sunyo.wlpt.message.builder.controller;
2 2
3 import com.sunyo.wlpt.message.builder.service.MT1201Service; 3 import com.sunyo.wlpt.message.builder.service.MT1201Service;
4 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
5 -import org.springframework.web.bind.annotation.RequestBody;  
6 -import org.springframework.web.bind.annotation.RequestMapping;  
7 -import org.springframework.web.bind.annotation.ResponseBody;  
8 -import org.springframework.web.bind.annotation.RestController; 5 +import org.springframework.web.bind.annotation.*;
9 6
10 import java.util.Map; 7 import java.util.Map;
11 8
@@ -21,30 +18,49 @@ public class MT1201Controller { @@ -21,30 +18,49 @@ public class MT1201Controller {
21 * @param map 18 * @param map
22 * @return 19 * @return
23 */ 20 */
24 - @RequestMapping("/1201create") 21 + @RequestMapping("/createMt1201")
25 @ResponseBody 22 @ResponseBody
26 public int ffmcreate(@RequestBody Map<String, Object> map){ 23 public int ffmcreate(@RequestBody Map<String, Object> map){
27 24
28 try { 25 try {
29 26
  27 + return mt1201Service.ffmcreate(map);
  28 + }catch (Exception e){
  29 + e.printStackTrace();
  30 + return 0;
  31 + }
  32 + }
30 33
31 34
32 - return 200; 35 + /**
  36 + * 原始 FFm
  37 + * @param map
  38 + * @return
  39 + */
  40 + @PutMapping("/editMt1201")
  41 + @ResponseBody
  42 + public int editMt1201(@RequestBody Map<String, Object> map){
  43 +
  44 + try {
  45 +
  46 + return mt1201Service.editMt1201(map);
33 }catch (Exception e){ 47 }catch (Exception e){
34 e.printStackTrace(); 48 e.printStackTrace();
35 - return 201; 49 + return 0;
36 } 50 }
37 } 51 }
38 52
39 - @RequestMapping("/mt1201remove")  
40 - public Boolean mt1201remove(@RequestBody Map<String, Object> map){ 53 +
  54 + @PutMapping("/removeMt1201")
  55 + @ResponseBody
  56 + public int removeMt1201(@RequestBody Map<String, Object> map){
41 57
42 try { 58 try {
43 59
44 - return true; 60 + return mt1201Service.removeMt1201(map);
45 }catch (Exception e){ 61 }catch (Exception e){
46 e.printStackTrace(); 62 e.printStackTrace();
47 - return false; 63 + return 0;
48 } 64 }
49 } 65 }
50 66
@@ -4,10 +4,7 @@ package com.sunyo.wlpt.message.builder.controller; @@ -4,10 +4,7 @@ package com.sunyo.wlpt.message.builder.controller;
4 import com.sunyo.wlpt.message.builder.service.MT3201Service; 4 import com.sunyo.wlpt.message.builder.service.MT3201Service;
5 import io.swagger.annotations.ApiModel; 5 import io.swagger.annotations.ApiModel;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 -import org.springframework.web.bind.annotation.RequestBody;  
8 -import org.springframework.web.bind.annotation.RequestMapping;  
9 -import org.springframework.web.bind.annotation.ResponseBody;  
10 -import org.springframework.web.bind.annotation.RestController; 7 +import org.springframework.web.bind.annotation.*;
11 8
12 import java.util.Map; 9 import java.util.Map;
13 10
@@ -33,7 +30,7 @@ public class MT3201Controller { @@ -33,7 +30,7 @@ public class MT3201Controller {
33 30
34 } 31 }
35 32
36 - @RequestMapping("/removeMt3201") 33 + @PutMapping("/removeMt3201")
37 @ResponseBody 34 @ResponseBody
38 public int remove(@RequestBody Map<String, Object> map){ 35 public int remove(@RequestBody Map<String, Object> map){
39 36
@@ -2,10 +2,7 @@ package com.sunyo.wlpt.message.builder.controller; @@ -2,10 +2,7 @@ package com.sunyo.wlpt.message.builder.controller;
2 2
3 import com.sunyo.wlpt.message.builder.service.MT520XService; 3 import com.sunyo.wlpt.message.builder.service.MT520XService;
4 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
5 -import org.springframework.web.bind.annotation.RequestBody;  
6 -import org.springframework.web.bind.annotation.RequestMapping;  
7 -import org.springframework.web.bind.annotation.ResponseBody;  
8 -import org.springframework.web.bind.annotation.RestController; 5 +import org.springframework.web.bind.annotation.*;
9 6
10 import java.util.Map; 7 import java.util.Map;
11 8
@@ -43,7 +40,7 @@ public class MT520XController { @@ -43,7 +40,7 @@ public class MT520XController {
43 * @param map 40 * @param map
44 * @return 41 * @return
45 */ 42 */
46 - @RequestMapping("/removeMt520x") 43 + @PutMapping("/removeMt520x")
47 @ResponseBody 44 @ResponseBody
48 public int remove520x(@RequestBody Map<String, Object> map){ 45 public int remove520x(@RequestBody Map<String, Object> map){
49 46
@@ -8,4 +8,8 @@ public interface MT1201Service { @@ -8,4 +8,8 @@ public interface MT1201Service {
8 8
9 int ffmcreate (Map<String, Object> map) throws IOException; 9 int ffmcreate (Map<String, Object> map) throws IOException;
10 10
  11 + int editMt1201 (Map<String, Object> map) throws IOException;
  12 +
  13 + int removeMt1201 (Map<String, Object> map) throws IOException;
  14 +
11 } 15 }
@@ -6,6 +6,7 @@ import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201; @@ -6,6 +6,7 @@ import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201;
6 import com.sunyo.wlpt.message.builder.service.MT1201Service; 6 import com.sunyo.wlpt.message.builder.service.MT1201Service;
7 import com.sunyo.wlpt.message.builder.util.CustomXmlMaker; 7 import com.sunyo.wlpt.message.builder.util.CustomXmlMaker;
8 import com.tianbo.util.Date.DateUtil; 8 import com.tianbo.util.Date.DateUtil;
  9 +import org.springframework.beans.factory.annotation.Value;
9 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
10 11
11 import java.io.IOException; 12 import java.io.IOException;
@@ -15,41 +16,79 @@ import java.util.Map; @@ -15,41 +16,79 @@ import java.util.Map;
15 @Service 16 @Service
16 public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{ 17 public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
17 18
  19 + @Value("${custom.custom-code}")
  20 + private String orgsn;
  21 +
  22 + @Value("${custom.org-code}")
  23 + private String orgCode;
18 24
19 @Override 25 @Override
20 public int ffmcreate(Map<String, Object> map) throws IOException { 26 public int ffmcreate(Map<String, Object> map) throws IOException {
21 27
22 - ObjectMapper objectMapper = new ObjectMapper(); 28 + map.put("templatePath", "/manifest/MT1201.ftlx");
  29 + map.put("sendPath", "./send/add/");
  30 + return mt1201(map);
  31 + }
23 32
24 - NMMS_CUSTOM_MT1201 customMt1201 = objectMapper.convertValue(map.get("mt1201"), NMMS_CUSTOM_MT1201.class); 33 + @Override
  34 + public int editMt1201(Map<String, Object> map) throws IOException {
25 35
26 - Map<String, Object> hashMap = new HashMap(); 36 + map.put("templatePath", "/edit/MT1201.ftlx");
  37 + map.put("sendPath", "./send/edit/");
  38 + return mt1201(map);
  39 + }
  40 +
  41 + @Override
  42 + public int removeMt1201(Map<String, Object> map) throws IOException {
  43 +
  44 + String customCode = map.get("customCode").toString();
  45 + // 生成报文头部
  46 + String msgId = makeMsgID("MT1201", orgsn, map.get("awba").toString());
  47 + String senderId = makeSenderID(customCode, orgsn, "");
  48 + String receiverID = customCode;
  49 + map.put("msgId", msgId);
  50 + map.put("senderId", senderId);
  51 + map.put("receiverID", receiverID);
  52 + // 报文头时间 精确到毫秒
  53 + map.put("sendTime", DateUtil.getCurrentTime17());
  54 + // 舱单传输人名称
  55 + map.put("orgCode", orgCode);
  56 + // 生成报文
  57 + if (makeXmlToFile("/remove/MT1201.ftlx", msgId+".xml", map, "./send/remove/")>0){
  58 + return 1;
  59 + }else {
  60 + return 0;
  61 + }
  62 + }
27 63
28 - AWB_AWBINFO awbAwbinfo = customMt1201.getAwbinfo();  
29 64
  65 + public int mt1201(Map<String, Object> map) throws IOException {
  66 + ObjectMapper objectMapper = new ObjectMapper();
  67 + // 预配
  68 + NMMS_CUSTOM_MT1201 customMt1201 = objectMapper.convertValue(map.get("mt1201"), NMMS_CUSTOM_MT1201.class);
  69 + // 运单
  70 + AWB_AWBINFO awbAwbinfo = customMt1201.getAwbinfo();
30 // 关区代码 71 // 关区代码
31 String customCode = customMt1201.getCustomcode(); 72 String customCode = customMt1201.getCustomcode();
32 // 报文头时间 精确到毫秒 73 // 报文头时间 精确到毫秒
33 - hashMap.put("sendTime", DateUtil.getCurrentTime17()); 74 + map.put("sendTime", DateUtil.getCurrentTime17());
34 // 封装实体 75 // 封装实体
35 - hashMap.put("mt", customMt1201);  
36 -  
37 - hashMap.put("awbAwbinfo", customMt1201);  
38 - 76 + map.put("mt", customMt1201);
  77 + map.put("awbAwbinfo", awbAwbinfo);
39 // 生成报文头部 78 // 生成报文头部
40 - String msgId = makeMsgID("MT1201", "460470678920X", customMt1201.getAwba());  
41 - String msessageType = "MT1201";  
42 - String senderId = makeSenderID(customCode, "460470678920X", "DXPENT0000460002"); 79 + String msgId = makeMsgID("MT2201", orgsn, customMt1201.getAwba());
  80 + String senderId = makeSenderID(customCode, orgsn, "");
43 String receiverID = customCode; 81 String receiverID = customCode;
44 - hashMap.put("msgId", msgId);  
45 - hashMap.put("msessageType", msessageType);  
46 - hashMap.put("senderId", senderId);  
47 - hashMap.put("receiverID", receiverID);  
48 -// if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap)>0){  
49 -// return 200;  
50 -// }else {  
51 -// return 201;  
52 -// } 82 + map.put("msgId", msgId);
  83 + map.put("senderId", senderId);
  84 + map.put("receiverID", receiverID);
  85 + // 舱单传输人名称
  86 + map.put("orgCode", orgCode);
  87 + // 生成报文
  88 + if (makeXmlToFile(map.get("templatePath").toString(), msgId+".xml", map, map.get("sendPath").toString())>0){
  89 + return 1;
  90 + }else {
53 return 0; 91 return 0;
54 } 92 }
  93 + }
55 } 94 }
@@ -74,11 +74,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service { @@ -74,11 +74,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
74 String customCode = map.get("customCode").toString(); 74 String customCode = map.get("customCode").toString();
75 // 生成报文头部 75 // 生成报文头部
76 String msgId = makeMsgID("MT2201", orgsn, map.get("awba").toString()); 76 String msgId = makeMsgID("MT2201", orgsn, map.get("awba").toString());
77 - String msessageType = "MT2201";  
78 String senderId = makeSenderID(customCode, orgsn, ""); 77 String senderId = makeSenderID(customCode, orgsn, "");
79 String receiverID = customCode; 78 String receiverID = customCode;
80 map.put("msgId", msgId); 79 map.put("msgId", msgId);
81 - map.put("msessageType", msessageType);  
82 map.put("senderId", senderId); 80 map.put("senderId", senderId);
83 map.put("receiverID", receiverID); 81 map.put("receiverID", receiverID);
84 // 报文头时间 精确到毫秒 82 // 报文头时间 精确到毫秒
@@ -109,11 +107,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service { @@ -109,11 +107,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
109 map.put("awbAwbinfo", awbAwbinfo); 107 map.put("awbAwbinfo", awbAwbinfo);
110 // 生成报文头部 108 // 生成报文头部
111 String msgId = makeMsgID("MT2201", orgsn, custom_mt2201.getAwba()); 109 String msgId = makeMsgID("MT2201", orgsn, custom_mt2201.getAwba());
112 - String msessageType = "MT2201";  
113 String senderId = makeSenderID(customCode, orgsn, ""); 110 String senderId = makeSenderID(customCode, orgsn, "");
114 String receiverID = customCode; 111 String receiverID = customCode;
115 map.put("msgId", msgId); 112 map.put("msgId", msgId);
116 - map.put("msessageType", msessageType);  
117 map.put("senderId", senderId); 113 map.put("senderId", senderId);
118 map.put("receiverID", receiverID); 114 map.put("receiverID", receiverID);
119 // 舱单传输人名称 115 // 舱单传输人名称
@@ -35,11 +35,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service { @@ -35,11 +35,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
35 map.put("mt", customMt3201); 35 map.put("mt", customMt3201);
36 // 生成报文头部 36 // 生成报文头部
37 String msgId = makeMsgID("MT3201", orgsn, customMt3201.getAwba()); 37 String msgId = makeMsgID("MT3201", orgsn, customMt3201.getAwba());
38 - String msessageType = "MT3201";  
39 String senderId = makeSenderID(customCode, orgsn, ""); 38 String senderId = makeSenderID(customCode, orgsn, "");
40 String receiverID = customCode; 39 String receiverID = customCode;
41 map.put("msgId", msgId); 40 map.put("msgId", msgId);
42 - map.put("msessageType", msessageType);  
43 map.put("senderId", senderId); 41 map.put("senderId", senderId);
44 map.put("receiverID", receiverID); 42 map.put("receiverID", receiverID);
45 if (makeXmlToFile("/manifest/MT3201.ftlx", msgId+".xml", map,"./send/add/")>0){ 43 if (makeXmlToFile("/manifest/MT3201.ftlx", msgId+".xml", map,"./send/add/")>0){
@@ -57,11 +55,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service { @@ -57,11 +55,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
57 map.put("sendTime", DateUtil.getCurrentTime17()); 55 map.put("sendTime", DateUtil.getCurrentTime17());
58 // 生成报文头部 56 // 生成报文头部
59 String msgId = makeMsgID("MT3201", orgsn, map.get("awba").toString()); 57 String msgId = makeMsgID("MT3201", orgsn, map.get("awba").toString());
60 - String msessageType = "MT3201";  
61 String senderId = makeSenderID(customCode, orgsn, ""); 58 String senderId = makeSenderID(customCode, orgsn, "");
62 String receiverID = customCode; 59 String receiverID = customCode;
63 map.put("msgId", msgId); 60 map.put("msgId", msgId);
64 - map.put("msessageType", msessageType);  
65 map.put("senderId", senderId); 61 map.put("senderId", senderId);
66 map.put("receiverID", receiverID); 62 map.put("receiverID", receiverID);
67 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){ 63 if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){
@@ -36,11 +36,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service { @@ -36,11 +36,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
36 36
37 // 生成报文头部 37 // 生成报文头部
38 String msgId = makeMsgID("MT4201", orgsn, customMt4201.getAwba()); 38 String msgId = makeMsgID("MT4201", orgsn, customMt4201.getAwba());
39 - String msessageType = "MT4201";  
40 String senderId = makeSenderID(customCode, orgsn); 39 String senderId = makeSenderID(customCode, orgsn);
41 String receiverID = customCode; 40 String receiverID = customCode;
42 map.put("msgId", msgId); 41 map.put("msgId", msgId);
43 - map.put("msessageType", msessageType);  
44 map.put("senderId", senderId); 42 map.put("senderId", senderId);
45 map.put("receiverID", receiverID); 43 map.put("receiverID", receiverID);
46 if (makeXmlToFile("/manifest/MT4201.ftlx", msgId+".xml", map, "./send/add/")>0){ 44 if (makeXmlToFile("/manifest/MT4201.ftlx", msgId+".xml", map, "./send/add/")>0){
@@ -62,11 +60,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service { @@ -62,11 +60,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
62 map.put("flightDate",flightDate); 60 map.put("flightDate",flightDate);
63 // 生成报文头部 61 // 生成报文头部
64 String msgId = makeMsgID("MT4201", orgsn, map.get("awba").toString()); 62 String msgId = makeMsgID("MT4201", orgsn, map.get("awba").toString());
65 - String msessageType = "MT4201";  
66 String senderId = makeSenderID(customCode, orgsn); 63 String senderId = makeSenderID(customCode, orgsn);
67 String receiverID = customCode; 64 String receiverID = customCode;
68 map.put("msgId", msgId); 65 map.put("msgId", msgId);
69 - map.put("msessageType", msessageType);  
70 map.put("senderId", senderId); 66 map.put("senderId", senderId);
71 map.put("receiverID", receiverID); 67 map.put("receiverID", receiverID);
72 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 68 if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){
@@ -40,28 +40,28 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -40,28 +40,28 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
40 hashMap.put("mt", customMt520X); 40 hashMap.put("mt", customMt520X);
41 hashMap.put("orgCode", orgCode); 41 hashMap.put("orgCode", orgCode);
42 42
43 - if ("5201".equals(customMt520X.getExt1())){ 43 + if ("5201".equals(customMt520X.getRcfdep())){
44 44
45 // 生成报文头部 45 // 生成报文头部
46 String msgId = makeMsgID("MT5201", orgsn, customMt520X.getAwba()); 46 String msgId = makeMsgID("MT5201", orgsn, customMt520X.getAwba());
47 String msessageType = "MT5201"; 47 String msessageType = "MT5201";
48 - String senderId = makeSenderID(customCode, orgsn, "DXPENT0000460002"); 48 + String senderId = makeSenderID(customCode, orgsn, "");
49 String receiverID = customCode; 49 String receiverID = customCode;
50 hashMap.put("msgId", msgId); 50 hashMap.put("msgId", msgId);
51 hashMap.put("msessageType", msessageType); 51 hashMap.put("msessageType", msessageType);
52 hashMap.put("senderId", senderId); 52 hashMap.put("senderId", senderId);
53 hashMap.put("receiverID", receiverID); 53 hashMap.put("receiverID", receiverID);
54 -// if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap)>0){  
55 -// return true;  
56 -// }else {  
57 -// return false;  
58 -// } 54 + if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){
  55 + return 1;
  56 + }else {
  57 + return 0;
  58 + }
59 }else { 59 }else {
60 60
61 // 生成报文头部 61 // 生成报文头部
62 String msgId = makeMsgID("MT5202", orgsn, customMt520X.getAwba()); 62 String msgId = makeMsgID("MT5202", orgsn, customMt520X.getAwba());
63 String msessageType = "MT5202"; 63 String msessageType = "MT5202";
64 - String senderId = makeSenderID(customCode, orgsn, "DXPENT0000460002"); 64 + String senderId = makeSenderID(customCode, orgsn, "");
65 String receiverID = customCode; 65 String receiverID = customCode;
66 hashMap.put("msgId", msgId); 66 hashMap.put("msgId", msgId);
67 hashMap.put("msessageType", msessageType); 67 hashMap.put("msessageType", msessageType);
@@ -78,7 +78,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -78,7 +78,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
78 e.printStackTrace(); 78 e.printStackTrace();
79 return 0; 79 return 0;
80 } 80 }
81 - return 0; 81 +
82 } 82 }
83 83
84 @Override 84 @Override
@@ -88,14 +88,12 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -88,14 +88,12 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
88 map.put("customCode", customCode); 88 map.put("customCode", customCode);
89 // 报文头时间 精确到毫秒 89 // 报文头时间 精确到毫秒
90 map.put("sendTime", DateUtil.getCurrentTime17()); 90 map.put("sendTime", DateUtil.getCurrentTime17());
91 - if ("5201".equals(map.get("mt520x").toString())){ 91 + if ("5201".equals(map.get("rcfdep").toString())){
92 // 生成报文头部 92 // 生成报文头部
93 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString()); 93 String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString());
94 - String msessageType = "MT5201";  
95 String senderId = makeSenderID(customCode, orgsn, ""); 94 String senderId = makeSenderID(customCode, orgsn, "");
96 String receiverID = customCode; 95 String receiverID = customCode;
97 map.put("msgId", msgId); 96 map.put("msgId", msgId);
98 - map.put("msessageType", msessageType);  
99 map.put("senderId", senderId); 97 map.put("senderId", senderId);
100 map.put("receiverID", receiverID); 98 map.put("receiverID", receiverID);
101 if (makeXmlToFile("/remove/MT5201.ftlx", msgId+".xml", map, "./send/remove/")>0){ 99 if (makeXmlToFile("/remove/MT5201.ftlx", msgId+".xml", map, "./send/remove/")>0){
@@ -106,11 +104,9 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{ @@ -106,11 +104,9 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
106 }else { 104 }else {
107 // 生成报文头部 105 // 生成报文头部
108 String msgId = makeMsgID("MT5202", orgsn, map.get("awba").toString()); 106 String msgId = makeMsgID("MT5202", orgsn, map.get("awba").toString());
109 - String msessageType = "MT5202";  
110 String senderId = makeSenderID(customCode, orgsn, ""); 107 String senderId = makeSenderID(customCode, orgsn, "");
111 String receiverID = customCode; 108 String receiverID = customCode;
112 map.put("msgId", msgId); 109 map.put("msgId", msgId);
113 - map.put("msessageType", msessageType);  
114 map.put("senderId", senderId); 110 map.put("senderId", senderId);
115 map.put("receiverID", receiverID); 111 map.put("receiverID", receiverID);
116 if (makeXmlToFile("/remove/MT5202.ftlx", msgId+".xml", map, "./send/remove/")>0){ 112 if (makeXmlToFile("/remove/MT5202.ftlx", msgId+".xml", map, "./send/remove/")>0){
  1 +<Manifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:Declaration:datamodel:standard:CN:MT1201:1">
  2 + <Head>
  3 + <MessageID>${msgId}</MessageID>
  4 + <FunctionCode>5</FunctionCode>
  5 + <MessageType>MT1201</MessageType>
  6 + <SenderID>${senderId}</SenderID>
  7 + <ReceiverID>${receiverID}</ReceiverID>
  8 + <SendTime>${sendTime}</SendTime>
  9 + <Version>1.0</Version>
  10 + </Head>
  11 + <Declaration>
  12 + <RepresentativePerson>
  13 + <Name>${orgCode}</Name>
  14 + </RepresentativePerson>
  15 + <ExitCustomsOffice>
  16 + <ID>${mt.originstation}</ID>
  17 + </ExitCustomsOffice>
  18 + <Carrier>
  19 + <ID>${mt.carrier}</ID>
  20 + </Carrier>
  21 + <BorderTransportMeans>
  22 + <JourneyID>${mt.carrier}${mt.flightno}/${mt.flightdate?string('yyyyMMdd')}</JourneyID>
  23 + <TypeCode>4</TypeCode>
  24 + <FirstArrivalLocationID>${mt.destinationstation}</FirstArrivalLocationID>
  25 + <ArrivalDateTime>20200224171901086</ArrivalDateTime>
  26 + <DepartureDateTime>20200224151901086</DepartureDateTime>
  27 + </BorderTransportMeans>
  28 + <Consignment>
  29 + <TransportContractDocument>
  30 + <ID>${mt.awba}</ID>
  31 + <ChangeReasonCode>999</ChangeReasonCode>
  32 + <ConditionCode>10</ConditionCode>
  33 + </TransportContractDocument>
  34 + <#if mt.awbh?length gt 1>
  35 + <AssociatedTransportDocument>
  36 + <ID>${mt.awba}_${mt.awbh}</ID>
  37 + </AssociatedTransportDocument>
  38 + </#if>
  39 + <LoadingLocation>
  40 + <ID>${mt.originstation}</ID>
  41 + </LoadingLocation>
  42 + <UnloadingLocation>
  43 + <ID>${mt.destinationstation}/${mt.customcode}</ID>
  44 + <ArrivalDate>20200121</ArrivalDate>
  45 + </UnloadingLocation>
  46 + <GoodsConsignedPlace>
  47 + <ID>${mt.destinationstation}</ID>
  48 + </GoodsConsignedPlace>
  49 + <TransportSplitIndicator>${mt.splitcode}</TransportSplitIndicator>
  50 + <FreightPayment>
  51 + <MethodCode>${awbAwbinfo.paymodel}</MethodCode>
  52 + </FreightPayment>
  53 + <ConsignmentPackaging>
  54 + <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
  55 + </ConsignmentPackaging>
  56 + <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
  57 + <Consignee>
  58 + <Name>${awbAwbinfo.cnsnname}</Name>
  59 + <Address>
  60 + <Line>${awbAwbinfo.cnsnaddress}</Line>
  61 + <CountryCode>${awbAwbinfo.cnscountyr}</CountryCode>
  62 + </Address>
  63 + <Communication>
  64 + <ID>${awbAwbinfo.cnsntel}</ID>
  65 + <TypeID>TE</TypeID>
  66 + </Communication>
  67 + </Consignee>
  68 + <Consignor>
  69 + <Name>${awbAwbinfo.shprname}</Name>
  70 + <Address>
  71 + <Line>${awbAwbinfo.shpraddress}</Line>
  72 + <CountryCode>${awbAwbinfo.shprcountyr}</CountryCode>
  73 + </Address>
  74 + <Communication>
  75 + <ID>${awbAwbinfo.shprtel}</ID>
  76 + <TypeID>FX</TypeID>
  77 + </Communication>
  78 + </Consignor>
  79 + <ConsignmentItem>
  80 + <SequenceNumeric>1</SequenceNumeric>
  81 + <ConsignmentItemPackaging>
  82 + <QuantityQuantity>${mt.piece}</QuantityQuantity>
  83 + </ConsignmentItemPackaging>
  84 + <Commodity>
  85 + <CargoDescription>${mt.goodsname}</CargoDescription>
  86 + </Commodity>
  87 + <GoodsMeasure>
  88 + <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
  89 + </GoodsMeasure>
  90 + </ConsignmentItem>
  91 + </Consignment>
  92 + <AdditionalInformation>
  93 + <Reason>${reason}</Reason>
  94 + <ContactName>${contactName}</ContactName>
  95 + <ContactTel>${contactTel}</ContactTel>
  96 + </AdditionalInformation>
  97 + </Declaration>
  98 +</Manifest>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <Head> 3 <Head>
4 <MessageID>${msgId}</MessageID> 4 <MessageID>${msgId}</MessageID>
5 <FunctionCode>5</FunctionCode> 5 <FunctionCode>5</FunctionCode>
6 - <MessageType>${msessageType}</MessageType> 6 + <MessageType>MT2201</MessageType>
7 <SenderID>${senderId}</SenderID> 7 <SenderID>${senderId}</SenderID>
8 <ReceiverID>${receiverID}</ReceiverID> 8 <ReceiverID>${receiverID}</ReceiverID>
9 <SendTime>${sendTime}</SendTime> 9 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>9</FunctionCode> 4 <FunctionCode>9</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT1201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <RepresentativePerson> 12 <RepresentativePerson>
13 - <Name>9141010070678920XJ</Name> 13 + <Name>${orgCode}</Name>
14 </RepresentativePerson> 14 </RepresentativePerson>
15 <ExitCustomsOffice> 15 <ExitCustomsOffice>
16 <ID>${mt.originstation}</ID> 16 <ID>${mt.originstation}</ID>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <ID>${mt.carrier}</ID> 19 <ID>${mt.carrier}</ID>
20 </Carrier> 20 </Carrier>
21 <BorderTransportMeans> 21 <BorderTransportMeans>
22 - <JourneyID>${mt.carrier}${mt.flightno}/${mt.flightdate}</JourneyID> 22 + <JourneyID>${mt.carrier}${mt.flightno}/${mt.flightdate?string('yyyyMMdd')}</JourneyID>
23 <TypeCode>4</TypeCode> 23 <TypeCode>4</TypeCode>
24 <FirstArrivalLocationID>${mt.destinationstation}</FirstArrivalLocationID> 24 <FirstArrivalLocationID>${mt.destinationstation}</FirstArrivalLocationID>
25 <ArrivalDateTime>20200121053117086</ArrivalDateTime> 25 <ArrivalDateTime>20200121053117086</ArrivalDateTime>
@@ -27,63 +27,65 @@ @@ -27,63 +27,65 @@
27 </BorderTransportMeans> 27 </BorderTransportMeans>
28 <Consignment> 28 <Consignment>
29 <TransportContractDocument> 29 <TransportContractDocument>
30 - <ID>61877590785</ID> 30 + <ID>${mt.awba}</ID>
31 <ConditionCode>10</ConditionCode> 31 <ConditionCode>10</ConditionCode>
32 </TransportContractDocument> 32 </TransportContractDocument>
  33 + <#if mt.awbh?length gt 1>
33 <AssociatedTransportDocument> 34 <AssociatedTransportDocument>
34 - <ID>61877590785_SG101393846</ID> 35 + <ID>${mt.awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 36 </AssociatedTransportDocument>
  37 + </#if>
36 <LoadingLocation> 38 <LoadingLocation>
37 - <ID>SIN</ID> 39 + <ID>${mt.originstation}</ID>
38 </LoadingLocation> 40 </LoadingLocation>
39 <UnloadingLocation> 41 <UnloadingLocation>
40 - <ID>CGO/4604</ID> 42 + <ID>${mt.destinationstation}/${mt.customcode}</ID>
41 <ArrivalDate>20200121</ArrivalDate> 43 <ArrivalDate>20200121</ArrivalDate>
42 </UnloadingLocation> 44 </UnloadingLocation>
43 <GoodsConsignedPlace> 45 <GoodsConsignedPlace>
44 - <ID>SIN</ID> 46 + <ID>${mt.destinationstation}</ID>
45 </GoodsConsignedPlace> 47 </GoodsConsignedPlace>
46 - <CustomsStatusCode>001</CustomsStatusCode>  
47 - <TransportSplitIndicator>0</TransportSplitIndicator> 48 + <CustomsStatusCode>${awbAwbinfo.awbtype}</CustomsStatusCode>
  49 + <TransportSplitIndicator>${mt.splitcode}</TransportSplitIndicator>
48 <FreightPayment> 50 <FreightPayment>
49 - <MethodCode>PP</MethodCode> 51 + <MethodCode>${awbAwbinfo.paymodel}</MethodCode>
50 </FreightPayment> 52 </FreightPayment>
51 <ConsignmentPackaging> 53 <ConsignmentPackaging>
52 - <QuantityQuantity>1</QuantityQuantity> 54 + <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
53 </ConsignmentPackaging> 55 </ConsignmentPackaging>
54 - <TotalGrossMassMeasure>124.0</TotalGrossMassMeasure> 56 + <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
55 <Consignee> 57 <Consignee>
56 - <Name>HONGFUJIN PRECISION ELECTRONICS</Name> 58 + <Name>${awbAwbinfo.cnsnname}</Name>
57 <Address> 59 <Address>
58 - <Line>F01 THE COPREHENSIVE BONDED AREA</Line>  
59 - <CountryCode>CN</CountryCode> 60 + <Line>${awbAwbinfo.cnsnaddress}</Line>
  61 + <CountryCode>${awbAwbinfo.cnscountyr}</CountryCode>
60 </Address> 62 </Address>
61 <Communication> 63 <Communication>
62 - <ID>863716628288</ID> 64 + <ID>${awbAwbinfo.cnsntel}</ID>
63 <TypeID>TE</TypeID> 65 <TypeID>TE</TypeID>
64 </Communication> 66 </Communication>
65 </Consignee> 67 </Consignee>
66 <Consignor> 68 <Consignor>
67 - <Name>AVNET ASIA PTE LTD TAIWAN BRANCH</Name> 69 + <Name>${awbAwbinfo.shprname}</Name>
68 <Address> 70 <Address>
69 - <Line>5F NO 3 YUAN CYU ST NANKANG SO</Line>  
70 - <CountryCode>TW</CountryCode> 71 + <Line>${awbAwbinfo.shpraddress}</Line>
  72 + <CountryCode>${awbAwbinfo.shprcountyr}</CountryCode>
71 </Address> 73 </Address>
72 <Communication> 74 <Communication>
73 - <ID>88632221868</ID> 75 + <ID>${awbAwbinfo.shprtel}</ID>
74 <TypeID>TE</TypeID> 76 <TypeID>TE</TypeID>
75 </Communication> 77 </Communication>
76 </Consignor> 78 </Consignor>
77 <ConsignmentItem> 79 <ConsignmentItem>
78 <SequenceNumeric>1</SequenceNumeric> 80 <SequenceNumeric>1</SequenceNumeric>
79 <ConsignmentItemPackaging> 81 <ConsignmentItemPackaging>
80 - <QuantityQuantity>1</QuantityQuantity> 82 + <QuantityQuantity>${mt.piece}</QuantityQuantity>
81 </ConsignmentItemPackaging> 83 </ConsignmentItemPackaging>
82 <Commodity> 84 <Commodity>
83 - <CargoDescription>ALS SENSOR MODU</CargoDescription> 85 + <CargoDescription>${mt.goodsname}</CargoDescription>
84 </Commodity> 86 </Commodity>
85 <GoodsMeasure> 87 <GoodsMeasure>
86 - <GrossMassMeasure>124.0</GrossMassMeasure> 88 + <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
87 </GoodsMeasure> 89 </GoodsMeasure>
88 </ConsignmentItem> 90 </ConsignmentItem>
89 </Consignment> 91 </Consignment>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>9</FunctionCode> 4 <FunctionCode>9</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT2201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>2</FunctionCode> 4 <FunctionCode>2</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT3201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>2</FunctionCode> 4 <FunctionCode>2</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT4201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>2</FunctionCode> 4 <FunctionCode>2</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT5201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -15,22 +15,24 @@ @@ -15,22 +15,24 @@
15 <TypeCode>4</TypeCode> 15 <TypeCode>4</TypeCode>
16 <ID>${mt.carrier}${mt.flightno}</ID> 16 <ID>${mt.carrier}${mt.flightno}</ID>
17 <Name>${mt.carrier}${mt.flightno}</Name> 17 <Name>${mt.carrier}${mt.flightno}</Name>
18 - <ActualDateTime>${mt.starttime?string('yyyyMMddHHmmssSSS')}</ActualDateTime>  
19 - <CompletedDateTime>${mt.endtime?string('yyyyMMddHHmmssSSS')}</CompletedDateTime> 18 + <ActualDateTime>${mt.starttime?string('yyyyMMddHHmmss')}</ActualDateTime>
  19 + <CompletedDateTime>${mt.endtime?string('yyyyMMddHHmmss')}</CompletedDateTime>
20 <UnloadingLocation> 20 <UnloadingLocation>
21 <ID>${mt.destinationstation}/${mt.customcode}</ID> 21 <ID>${mt.destinationstation}/${mt.customcode}</ID>
22 </UnloadingLocation> 22 </UnloadingLocation>
23 </BorderTransportMeans> 23 </BorderTransportMeans>
24 <TallyParty> 24 <TallyParty>
25 - <ID>???</ID> 25 + <ID>${orgCode}</ID>
26 </TallyParty> 26 </TallyParty>
27 <Consignment> 27 <Consignment>
28 <TransportContractDocument> 28 <TransportContractDocument>
29 <ID>${mt.awba}</ID> 29 <ID>${mt.awba}</ID>
30 </TransportContractDocument> 30 </TransportContractDocument>
  31 + <#if mt.awbh?length gt 1>
31 <AssociatedTransportDocument> 32 <AssociatedTransportDocument>
32 - <ID>${mt.awba}_${mt.awbh}</ID> 33 + <ID>${mt.awba}_${mtawbh}</ID>
33 </AssociatedTransportDocument> 34 </AssociatedTransportDocument>
  35 + </#if>
34 <ConsignmentPackaging> 36 <ConsignmentPackaging>
35 <QuantityQuantity>${mt.piece}</QuantityQuantity> 37 <QuantityQuantity>${mt.piece}</QuantityQuantity>
36 </ConsignmentPackaging> 38 </ConsignmentPackaging>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>2</FunctionCode> 4 <FunctionCode>2</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT5202</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -28,11 +28,13 @@ @@ -28,11 +28,13 @@
28 <TransportContractDocument> 28 <TransportContractDocument>
29 <ID>${mt.awba}</ID> 29 <ID>${mt.awba}</ID>
30 </TransportContractDocument> 30 </TransportContractDocument>
  31 + <#if mt['awbh']??>
31 <#if mt.awbh?length gt 1> 32 <#if mt.awbh?length gt 1>
32 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
33 <ID>${mt.awba}_${mtawbh}</ID> 34 <ID>${mt.awba}_${mtawbh}</ID>
34 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
35 </#if> 36 </#if>
  37 + </#if>
36 <ConsignmentPackaging> 38 <ConsignmentPackaging>
37 <QuantityQuantity>${mt.piece}</QuantityQuantity> 39 <QuantityQuantity>${mt.piece}</QuantityQuantity>
38 </ConsignmentPackaging> 40 </ConsignmentPackaging>
  1 +<Manifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:Declaration:datamodel:standard:CN:MT1201:1">
  2 + <Head>
  3 + <MessageID>${msgId}</MessageID>
  4 + <FunctionCode>3</FunctionCode>
  5 + <MessageType>MT1201</MessageType>
  6 + <SenderID>${senderId}</SenderID>
  7 + <ReceiverID>${receiverID}</ReceiverID>
  8 + <SendTime>${sendTime}</SendTime>
  9 + <Version>1.0</Version>
  10 + </Head>
  11 + <Declaration>
  12 + <RepresentativePerson>
  13 + <Name>${orgCode}</Name>
  14 + </RepresentativePerson>
  15 + <BorderTransportMeans>
  16 + <JourneyID>${flightNo}/${flightDate}</JourneyID>
  17 + </BorderTransportMeans>
  18 + <Consignment>
  19 + <TransportContractDocument>
  20 + <ID>${awba}</ID>
  21 + <ChangeReasonCode>999</ChangeReasonCode>
  22 + </TransportContractDocument>
  23 + <#if awbh?length gt 1>
  24 + <AssociatedTransportDocument>
  25 + <ID>${awba}_${awbh}</ID>
  26 + </AssociatedTransportDocument>
  27 + </#if>
  28 + </Consignment>
  29 + <AdditionalInformation>
  30 + <Reason>${reason}</Reason>
  31 + <ContactName>${contactName}</ContactName>
  32 + <ContactTel>${contactTel}</ContactTel>
  33 + </AdditionalInformation>
  34 + </Declaration>
  35 +</Manifest>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <Head> 3 <Head>
4 <MessageID>${msgId}</MessageID> 4 <MessageID>${msgId}</MessageID>
5 <FunctionCode>3</FunctionCode> 5 <FunctionCode>3</FunctionCode>
6 - <MessageType>${msessageType}</MessageType> 6 + <MessageType>MT2201</MessageType>
7 <SenderID>${senderId}</SenderID> 7 <SenderID>${senderId}</SenderID>
8 <ReceiverID>${receiverID}</ReceiverID> 8 <ReceiverID>${receiverID}</ReceiverID>
9 <SendTime>${sendTime}</SendTime> 9 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>3</FunctionCode> 4 <FunctionCode>3</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT3201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>3</FunctionCode> 4 <FunctionCode>3</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT4201</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <Head> 2 <Head>
3 <MessageID>${msgId}</MessageID> 3 <MessageID>${msgId}</MessageID>
4 <FunctionCode>3</FunctionCode> 4 <FunctionCode>3</FunctionCode>
5 - <MessageType>${msessageType}</MessageType> 5 + <MessageType>MT5021</MessageType>
6 <SenderID>${senderId}</SenderID> 6 <SenderID>${senderId}</SenderID>
7 <ReceiverID>${receiverID}</ReceiverID> 7 <ReceiverID>${receiverID}</ReceiverID>
8 <SendTime>${sendTime}</SendTime> 8 <SendTime>${sendTime}</SendTime>
1 <Manifest xmlns="urn:Declaration:datamodel:standard:CN:MT5202:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 1 <Manifest xmlns="urn:Declaration:datamodel:standard:CN:MT5202:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2 <Head> 2 <Head>
3 - <MessageID>${msgId}</MessageID> 3 + <MessageID>${map.msgId}</MessageID>
4 <FunctionCode>3</FunctionCode> 4 <FunctionCode>3</FunctionCode>
5 - <MessageType>${msessageType}</MessageType>  
6 - <SenderID>${senderId}</SenderID>  
7 - <ReceiverID>${receiverID}</ReceiverID>  
8 - <SendTime>${sendTime}</SendTime> 5 + <MessageType>MT5202</MessageType>
  6 + <SenderID>${map.senderId}</SenderID>
  7 + <ReceiverID>${map.receiverID}</ReceiverID>
  8 + <SendTime>${map.sendTime}</SendTime>
9 <Version>1.0</Version> 9 <Version>1.0</Version>
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 - <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 + <DeclarationOfficeID>${map.customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${flightNo}/${flightDate}</JourneyID> 14 + <JourneyID>${map.flightNo}/${map.flightDate}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
18 - <ID>${awba}</ID> 18 + <ID>${map.awba}</ID>
19 </TransportContractDocument> 19 </TransportContractDocument>
20 - <#if awbh?length gt 1> 20 + <#if map.map['awbh']??>
  21 + <#if map.awbh?length gt 1>
21 <AssociatedTransportDocument> 22 <AssociatedTransportDocument>
22 - <ID>${awba}_${awbh}</ID> 23 + <ID>${map.awba}_${map.awbh}</ID>
23 </AssociatedTransportDocument> 24 </AssociatedTransportDocument>
24 </#if> 25 </#if>
  26 + </#if>
25 </Consignment> 27 </Consignment>
26 <AdditionalInformation> 28 <AdditionalInformation>
27 - <Reason>${reason}</Reason>  
28 - <ContactName>${contactName}</ContactName>  
29 - <ContactTel>${contactTel}</ContactTel> 29 + <Reason>${map.reason}</Reason>
  30 + <ContactName>${map.contactName}</ContactName>
  31 + <ContactTel>${map.contactTel}</ContactTel>
30 <#if content?length gt 1> 32 <#if content?length gt 1>
31 <Content>${content}</Content> 33 <Content>${content}</Content>
32 </#if> 34 </#if>