分单为"" 改为 null 增加 回执 编号 23 24 25 业务操作

+package com.sunyo.wlpt.message.builder.controller;
+
+import com.sunyo.wlpt.message.builder.service.MT6202Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Map;
+
+@RequestMapping(value = "/mt6202")
+@RestController
+public class MT6202Controller {
+
+    @Autowired
+    private MT6202Service mt6202Service;
+
+    @PostMapping(value = "/creatMt6202")
+    @ResponseBody
+    public Map<String, Object> creatMt8205(@RequestBody Map<String, Object> map) throws IOException, ParseException {
+
+        return mt6202Service.creatMt6202(map);
+    }
+
+    @PutMapping(value = "/removeMt6202")
+    @ResponseBody
+    public Map<String, Object> removeMt6202(@RequestBody Map<String, Object> map) throws IOException, ParseException {
+
+        return mt6202Service.removeMt6202(map);
+    }
+
+}

+package com.sunyo.wlpt.message.builder.controller;
+
+import com.sunyo.wlpt.message.builder.service.MT8205Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Map;
+
+@RequestMapping(value = "/mt8205")
+@RestController
+public class MT8205Controller {
+
+    @Autowired
+    private MT8205Service mt8205Service;
+
+    @PostMapping(value = "/creatMt8205")
+    @ResponseBody
+    public Map<String, Object> creatMt8205(@RequestBody Map<String, Object> map) throws IOException, ParseException {
+
+        return mt8205Service.create8205(map);
+    }
+
+}

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -98,6 +99,8 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
             NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
             // 操作类型
             nmmsCustomResponse.setOpertype("删除");
+            nmmsCustomResponse.setCusrescode("24");
+            nmmsCustomResponse.setCusrestext("删除报发送成功");
             hashMap.put("status", "1");
             hashMap.put("customResponse", nmmsCustomResponse);
             return hashMap;
@@ -128,12 +131,16 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
         map.put("msgId", msgId);
         map.put("senderId", senderId);
         map.put("receiverID", receiverID);
+        String s = DateUtil.addDateMinut(new Date(), 6);
+        // 货物装卸时间
+        map.put("loadingDate",s);
         // 舱单传输人名称
         map.put("orgCode", orgCode);
 
         Map<String, Object> maps = new HashMap<>();
         // 生成报文
         if (makeXmlToFile(map.get("templatePath").toString(), msgId+".xml", map, map.get("sendPath").toString())>0){
+            if (!map.containsKey("reason")){
                 map.put("functionCode", "9");
                 map.put("busType","MT2201");
                 NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
@@ -145,19 +152,56 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
                 nmmsCustomResponse.setCarrier(custom_mt2201.getCarrier());
                 // 主单号
                 nmmsCustomResponse.setAwbano(custom_mt2201.getAwba());
+                if (!"".equals(custom_mt2201.getAwbh())){
                     // 分单号
                     nmmsCustomResponse.setAwbhno(custom_mt2201.getAwbh());
+                }else {
+                    nmmsCustomResponse.setAwbhno(null);
+                }
                 // 件数
                 nmmsCustomResponse.setBuspiece(Integer.valueOf(custom_mt2201.getPiece().toString()));
                 // 重量
                 nmmsCustomResponse.setBusweight(Long.valueOf(custom_mt2201.getWeight().toString()));
                 // 操作类型
                 nmmsCustomResponse.setOpertype("新增");
+                nmmsCustomResponse.setCusrescode("23");
+                nmmsCustomResponse.setCusrestext("新增报发送成功");
                 maps.put("status", "1");
                 maps.put("customResponse", nmmsCustomResponse);
 
                 return maps;
             }else {
+                map.put("functionCode", "5");
+                map.put("busType","MT2201");
+                NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+                // 航班日期
+                nmmsCustomResponse.setFlightdate(custom_mt2201.getFlightdate());
+                // 航班号
+                nmmsCustomResponse.setFlightno(custom_mt2201.getFlightno());
+                // 航班承运人
+                nmmsCustomResponse.setCarrier(custom_mt2201.getCarrier());
+                // 主单号
+                nmmsCustomResponse.setAwbano(custom_mt2201.getAwba());
+                if (!"".equals(custom_mt2201.getAwbh())){
+                    // 分单号
+                    nmmsCustomResponse.setAwbhno(custom_mt2201.getAwbh());
+                }else {
+                    nmmsCustomResponse.setAwbhno(null);
+                }
+                // 件数
+                nmmsCustomResponse.setBuspiece(Integer.valueOf(custom_mt2201.getPiece().toString()));
+                // 重量
+                nmmsCustomResponse.setBusweight(Long.valueOf(custom_mt2201.getWeight().toString()));
+                // 操作类型
+                nmmsCustomResponse.setOpertype("修改");
+                nmmsCustomResponse.setCusrescode("25");
+                nmmsCustomResponse.setCusrestext("修改报发送成功");
+                maps.put("status", "1");
+                maps.put("customResponse", nmmsCustomResponse);
+
+                return maps;
+            }
+        }else {
             maps.put("status", "0");
             return maps;
         }

@@ -58,14 +58,21 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
             nmmsCustomResponse.setCarrier(customMt3201.getCarrier());
             // 主单号
             nmmsCustomResponse.setAwbano(customMt3201.getAwba());
+            if (!"".equals(customMt3201.getAwbh())){
                 // 分单号
                 nmmsCustomResponse.setAwbhno(customMt3201.getAwbh());
+            }else {
+                nmmsCustomResponse.setAwbhno(null);
+            }
+
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt3201.getPiece().toString()));
             // 重量
             nmmsCustomResponse.setBusweight(Long.valueOf(customMt3201.getWeight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
+            nmmsCustomResponse.setCusrescode("23");
+            nmmsCustomResponse.setCusrestext("新增报发送成功");
             map3201.put("status", "1");
             map3201.put("customResponse", nmmsCustomResponse);
 
@@ -96,6 +103,8 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
             NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
             // 操作类型
             nmmsCustomResponse.setOpertype("删除");
+            nmmsCustomResponse.setCusrescode("24");
+            nmmsCustomResponse.setCusrestext("删除报发送成功");
             map3201.put("status", "1");
             map3201.put("customResponse", nmmsCustomResponse);
             return map3201;

@@ -59,14 +59,22 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
             nmmsCustomResponse.setCarrier(customMt4201.getCarrier());
             // 主单号
             nmmsCustomResponse.setAwbano(customMt4201.getAwba());
+            if (!"".equals(customMt4201.getAwbh())){
                 // 分单号
                 nmmsCustomResponse.setAwbhno(customMt4201.getAwbh());
+            }else {
+                // 分单号
+                nmmsCustomResponse.setAwbhno(null);
+            }
+
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt4201.getLodingpiece().toString()));
             // 重量
             nmmsCustomResponse.setBusweight(Long.valueOf(customMt4201.getLodingweight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
+            nmmsCustomResponse.setCusrescode("23");
+            nmmsCustomResponse.setCusrestext("新增报发送成功");
             map4201.put("status", "1");
             map4201.put("customResponse", nmmsCustomResponse);
 
@@ -98,6 +106,8 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
             NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
             // 操作类型
             nmmsCustomResponse.setOpertype("删除");
+            nmmsCustomResponse.setCusrescode("24");
+            nmmsCustomResponse.setCusrestext("删除报发送成功");
             map4201.put("status", "1");
             map4201.put("customResponse", nmmsCustomResponse);
             return map4201;

@@ -42,9 +42,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
             // 封装实体
             hashMap.put("mt", customMt520X);
             hashMap.put("orgCode", orgCode);
-
             if ("5201".equals(customMt520X.getRcfdep())){
-
                 // 生成报文头部
                 String msgId =  makeMsgID("MT5201", orgsn, customMt520X.getAwba());
                 String msessageType = "MT5201";
@@ -54,11 +52,41 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
                 hashMap.put("msessageType", msessageType);
                 hashMap.put("senderId", senderId);
                 hashMap.put("receiverID", receiverID);
-//                if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){
-//                    return 1;
-//                }else {
-//                    return 0;
-//                }
+                Map<String, Object> maps = new HashMap<>();
+                if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){
+
+                    hashMap.put("functionCode", "2");
+                    hashMap.put("busType","MT5201");
+                    NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(hashMap);
+                    // 航班日期
+                    nmmsCustomResponse.setFlightdate(customMt520X.getFlightdate());
+                    // 航班号
+                    nmmsCustomResponse.setFlightno(customMt520X.getFlightno());
+                    // 航班承运人
+                    nmmsCustomResponse.setCarrier(customMt520X.getCarrier());
+                    // 主单号
+                    nmmsCustomResponse.setAwbano(customMt520X.getAwba());
+                    if (!"".equals(customMt520X.getAwbh())){
+                        // 分单号
+                        nmmsCustomResponse.setAwbhno(customMt520X.getAwbh());
+                    }else {
+                        nmmsCustomResponse.setAwbhno(null);
+                    }
+                    // 件数
+                    nmmsCustomResponse.setBuspiece(customMt520X.getPiece());
+                    // 重量
+                    nmmsCustomResponse.setBusweight(customMt520X.getWeight());
+                    // 操作类型
+                    nmmsCustomResponse.setOpertype("新增");
+                    nmmsCustomResponse.setCusrescode("23");
+                    nmmsCustomResponse.setCusrestext("新增报发送成功");
+                    maps.put("status", "1");
+                    maps.put("customResponse", nmmsCustomResponse);
+                    return maps;
+                }else {
+                    maps.put("staus", "0");
+                    return maps;
+                }
             }else {
 
                 // 生成报文头部
@@ -84,14 +112,20 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
                     nmmsCustomResponse.setCarrier(customMt520X.getCarrier());
                     // 主单号
                     nmmsCustomResponse.setAwbano(customMt520X.getAwba());
+                    if (!"".equals(customMt520X.getAwbh())){
                         // 分单号
                         nmmsCustomResponse.setAwbhno(customMt520X.getAwbh());
+                    }else {
+                        nmmsCustomResponse.setAwbhno(null);
+                    }
                     // 件数
                     nmmsCustomResponse.setBuspiece(customMt520X.getPiece());
                     // 重量
                     nmmsCustomResponse.setBusweight(customMt520X.getWeight());
                     // 操作类型
                     nmmsCustomResponse.setOpertype("新增");
+                    nmmsCustomResponse.setCusrescode("23");
+                    nmmsCustomResponse.setCusrestext("新增报发送成功");
                     maps.put("status", "1");
                     maps.put("customResponse", nmmsCustomResponse);
 
@@ -106,7 +140,6 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
             e.printStackTrace();
             return null;
         }
-        return null;
 
     }
 
@@ -125,13 +158,23 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
             map.put("msgId", msgId);
             map.put("senderId", senderId);
             map.put("receiverID", receiverID);
-//            if (makeXmlToFile("/remove/MT5201.ftlx", msgId+".xml", map, "./send/remove/")>0){
-//
-//
-//                return 1;
-//            }else {
-//                return 0;
-//            }
+            Map<String, Object> maps = new HashMap<>();
+            if (makeXmlToFile("/remove/MT5201.ftlx", msgId+".xml", map, "./send/remove/")>0){
+
+                map.put("functionCode", "3");
+                map.put("busType","MT5201");
+                NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+                nmmsCustomResponse.setCusrescode("24");
+                nmmsCustomResponse.setCusrestext("删除报发送成功");
+                // 操作类型
+                nmmsCustomResponse.setOpertype("删除");
+                maps.put("status", "1");
+                maps.put("customResponse", nmmsCustomResponse);
+                return maps;
+            }else {
+                maps.put("staus", "0");
+                return maps;
+            }
         }else {
             // 生成报文头部
             String msgId =  makeMsgID("MT5202", orgsn, map.get("awba").toString());
@@ -146,17 +189,17 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
                 map.put("functionCode", "3");
                 map.put("busType","MT5202");
                 NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+                nmmsCustomResponse.setCusrescode("24");
+                nmmsCustomResponse.setCusrestext("删除报发送成功");
                 // 操作类型
                 nmmsCustomResponse.setOpertype("删除");
                 maps.put("status", "1");
                 maps.put("customResponse", nmmsCustomResponse);
-
                 return maps;
             }else {
                 maps.put("staus", "0");
                 return maps;
             }
         }
-        return null;
     }
 }

+package com.sunyo.wlpt.message.builder.service.imp;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE;
+import com.sunyo.wlpt.base.model.NMMS_CUSTOM_TRANS;
+import com.sunyo.wlpt.message.builder.service.MT6202Service;
+import com.sunyo.wlpt.message.builder.util.CustomXmlMaker;
+import com.sunyo.wlpt.message.builder.util.ReturnUtil;
+import com.tianbo.util.Date.DateUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
+
+    @Value("${custom.custom-code}")
+    private  String orgsn;
+
+    @Override
+    public Map<String, Object> creatMt6202(Map<String, Object> map) throws IOException, ParseException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        // 转运记录
+        NMMS_CUSTOM_TRANS nmmsCustomTrans = objectMapper.convertValue(map.get("mt6202"), NMMS_CUSTOM_TRANS.class);
+        // 关区代码
+        String customCode = nmmsCustomTrans.getCustomcode();
+        // 报文头时间 精确到毫秒
+        map.put("sendTime", DateUtil.getCurrentTime17());
+        // 封装实体
+        map.put("mt", nmmsCustomTrans);
+        // 生成报文头部
+        String msgId =  makeMsgID("MT6202", orgsn, nmmsCustomTrans.getAwba());
+        String msessageType = "MT6202";
+        String senderId = makeSenderID(customCode,  orgsn, "");
+        String receiverID = customCode;
+        map.put("msgId", msgId);
+        map.put("msessageType", msessageType);
+        map.put("senderId", senderId);
+        map.put("receiverID", receiverID);
+
+        Map<String, Object> map6202 = new HashMap<>();
+
+        if (makeXmlToFile("/manifest/MT6202.ftlx", msgId+".xml", map, "./send/add/")>0){
+            map.put("functionCode", "2");
+            map.put("busType","MT6202");
+            NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+            // 航班日期
+            nmmsCustomResponse.setFlightdate(nmmsCustomTrans.getFlightdate());
+            // 航班号
+            nmmsCustomResponse.setFlightno(nmmsCustomTrans.getFlightno());
+            // 航班承运人
+            nmmsCustomResponse.setCarrier(nmmsCustomTrans.getCarrier());
+            // 主单号
+            nmmsCustomResponse.setAwbano(nmmsCustomTrans.getAwba());
+            // 件数
+            nmmsCustomResponse.setBuspiece(Integer.valueOf(nmmsCustomTrans.getTurnpiece().toString()));
+            // 重量
+            nmmsCustomResponse.setBusweight(Long.valueOf(nmmsCustomTrans.getTurnweight().toString()));
+            // 操作类型
+            nmmsCustomResponse.setOpertype("新增");
+            nmmsCustomResponse.setCusrescode("23");
+            nmmsCustomResponse.setCusrestext("新增报发送成功");
+            map6202.put("status", "1");
+            map6202.put("customResponse", nmmsCustomResponse);
+
+            return map6202;
+        }else {
+            map6202.put("status", "0");
+            return map6202;
+        }
+    }
+
+    @Override
+    public Map<String, Object> removeMt6202(Map<String, Object> map) throws IOException, ParseException {
+        // 关区代码
+        String customCode = map.get("customCode").toString();
+        // 报文头时间 精确到毫秒
+        map.put("sendTime", DateUtil.getCurrentTime17());
+        // 生成报文头部
+        String msgId =  makeMsgID("MT6202", orgsn, map.get("awba").toString());
+        String senderId = makeSenderID(customCode,  orgsn, "");
+        String receiverID = customCode;
+        map.put("msgId", msgId);
+        map.put("senderId", senderId);
+        map.put("receiverID", receiverID);
+        Map<String, Object> map3201 = new HashMap<>();
+        if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){
+            map.put("functionCode", "3");
+            map.put("busType","MT6202");
+            NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+            // 操作类型
+            nmmsCustomResponse.setOpertype("删除");
+            nmmsCustomResponse.setCusrescode("24");
+            nmmsCustomResponse.setCusrestext("删除报发送成功");
+            map3201.put("status", "1");
+            map3201.put("customResponse", nmmsCustomResponse);
+            return map3201;
+        }else {
+            map3201.put("staus", "0");
+            return map3201;
+        }
+    }
+}

@@ -4,22 +4,31 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT1201;
 import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT2201;
 import com.sunyo.wlpt.base.model.NMMS_CUSTOM_MT8205;
+import com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE;
 import com.sunyo.wlpt.message.builder.service.MT8205Service;
 import com.sunyo.wlpt.message.builder.util.CustomXmlMaker;
+import com.sunyo.wlpt.message.builder.util.ReturnUtil;
 import com.tianbo.util.Date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.text.ParseException;
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
 public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
 
+    @Value("${custom.custom-code}")
+    private  String orgsn;
 
+    @Value("${custom.org-code}")
+    private String orgCode;
 
     @Override
-    public Boolean create8205(Map<String, Object> map) throws IOException {
+    public Map<String, Object> create8205(Map<String, Object> map) throws IOException, ParseException {
         ObjectMapper objectMapper = new ObjectMapper();
         // 转运记录
         NMMS_CUSTOM_MT8205 customMt8205 = objectMapper.convertValue(map.get("mt8205"), NMMS_CUSTOM_MT8205.class);
@@ -27,7 +36,6 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
         NMMS_CUSTOM_MT1201 customMt1201 = objectMapper.convertValue(map.get("mt1201"), NMMS_CUSTOM_MT1201.class);
         // 出港预配
         NMMS_CUSTOM_MT2201 customMt2201 = objectMapper.convertValue(map.get("mt2201"), NMMS_CUSTOM_MT2201.class);
-
         // 关区代码
         String customCode = customMt8205.getCustomcode();
         // 报文头时间 精确到毫秒
@@ -36,22 +44,49 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
         map.put("mt8205", customMt8205);
         map.put("mt1201", customMt1201);
         map.put("mt2201", customMt2201);
-
+        map.put("orgCode", orgCode);
         // 生成报文头部
-        String msgId =  makeMsgID("MT8205", "460470678920X", "");
+        String msgId =  makeMsgID("MT8205", orgsn, customMt1201.getAwba());
         String msessageType = "MT8205";
-        String senderId = makeSenderID(customCode,  "460470678920X", "DXPENT0000460002");
+        String senderId = makeSenderID(customCode,  orgsn, "");
         String receiverID = customCode;
         map.put("msgId", msgId);
         map.put("msessageType", msessageType);
         map.put("senderId", senderId);
         map.put("receiverID", receiverID);
 
-//        if (makeXmlToFile("/manifest/MT8205.ftlx", msgId+".xml", map)>0){
-//            return true;
-//        }else {
-//            return false;
-//        }
-        return null;
+        Map<String, Object> map8205 = new HashMap<>();
+
+        if (makeXmlToFile("/manifest/MT8205.ftlx", msgId+".xml", map, "./send/add/")>0){
+            map.put("functionCode", "2");
+            map.put("busType","MT8205");
+            NMMS_CUSTOM_RESPONSE nmmsCustomResponse = ReturnUtil.nmmsCustomResponse(map);
+            System.out.println();
+            // 航班日期
+            nmmsCustomResponse.setFlightdate(customMt1201.getFlightdate());
+            // 航班号
+            nmmsCustomResponse.setFlightno(customMt1201.getFlightno());
+            // 航班承运人
+            nmmsCustomResponse.setCarrier(customMt1201.getCarrier());
+            // 主单号
+            nmmsCustomResponse.setAwbano(customMt1201.getAwba());
+            // 分单号
+            nmmsCustomResponse.setAwbhno(customMt1201.getAwbh());
+            // 件数
+            nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt1201.getPiece().toString()));
+            // 重量
+            nmmsCustomResponse.setBusweight(Long.valueOf(customMt1201.getWeight().toString()));
+            // 操作类型
+            nmmsCustomResponse.setOpertype("新增");
+            nmmsCustomResponse.setCusrescode("23");
+            nmmsCustomResponse.setCusrestext("新增报发送成功");
+            map8205.put("status", "1");
+            map8205.put("customResponse", nmmsCustomResponse);
+
+            return map8205;
+        }else {
+            map8205.put("status", "0");
+            return map8205;
+        }
     }
 }

@@ -55,7 +55,13 @@ public class ReturnUtil {
             nmmsCustomResponse.setAwbano(map.get("awba").toString());
         }
         if (map.containsKey("awbh")){
+            if (!"".equals(map.get("awbh").toString())){
+                // 分单号
                 nmmsCustomResponse.setAwbhno(map.get("awbh").toString());
+            }else {
+                // 分单号
+                nmmsCustomResponse.setAwbhno(null);
+            }
         }
         if (map.containsKey("flightNo")){
             nmmsCustomResponse.setFlightno(map.get("flightNo").toString());

@@ -36,7 +36,7 @@
         </#if>
             <LoadingLocation>
                 <ID>${mt.originstation}/${mt.customcode}</ID>
-                <LoadingDate>202001210605086</LoadingDate>
+                <LoadingDate>${loadingDate}</LoadingDate>
             </LoadingLocation>
             <UnloadingLocation>
                 <ID>${mt.destinationstation}</ID>

@@ -34,7 +34,7 @@
         </#if>
             <LoadingLocation>
                 <ID>${mt.originstation}/${mt.customcode}</ID>
-                <LoadingDate>202001210605086</LoadingDate>
+                <LoadingDate>${loadingDate}</LoadingDate>
             </LoadingLocation>
             <UnloadingLocation>
                 <ID>${mt.destinationstation}</ID>

@@ -35,7 +35,7 @@
                 <QuantityQuantity>${mt.lodingpiece}</QuantityQuantity>
             </ConsignmentPackaging>
             <TotalGrossMassMeasure>${mt.lodingweight}</TotalGrossMassMeasure>
-            <TransportSplitIndicator>？？？<#--0整皮 1分批--></TransportSplitIndicator>
+            <TransportSplitIndicator>0</TransportSplitIndicator>
             <ConsignmentItem>
                 <Commodity>
                     <CargoDescription>${mt.goodsname}</CargoDescription>

-<Manifest xmlns="urn:Declaration:datamodel:standard:CN:MT6202:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<?xml version="1.0" encoding="utf-8"?>
+<Manifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:Declaration:datamodel:standard:CN:MT6202:1">
     <Head>
         <MessageID>${msgId}</MessageID>
         <FunctionCode>2</FunctionCode>
-        <MessageType>${msessageType}</MessageType>
+        <MessageType>MT8205</MessageType>
         <SenderID>${senderId}</SenderID>
         <ReceiverID>${receiverID}</ReceiverID>
         <SendTime>${sendTime}</SendTime>
@@ -12,9 +13,9 @@
         <BorderTransportMeans>
             <JourneyID>${mt.carrier}${mt.flightno}/${mt.flightdate?string('yyyyMMdd')}</JourneyID>
             <TypeCode>4</TypeCode>
-            <CargoFacilityLocation>${mt.turnunloading}/${mt.customcode}</CargoFacilityLocation>
+            <CargoFacilityLocation>${mt.turnunloading}</CargoFacilityLocation>
             <UnloadingLocation>
-                <ID>${destinationstation}/4620</ID>
+                <ID>CGO/${mt.customcode}</ID>
             </UnloadingLocation>
         </BorderTransportMeans>
         <Consignment>
@@ -26,10 +27,10 @@
             </ConsignmentPackaging>
             <TotalGrossMassMeasure>${mt.turnweight}</TotalGrossMassMeasure>
             <BorderTransportMeans>
-                <JourneyID>${mt.carrier}${mt.flightno}</JourneyID>
+                <JourneyID>${mt.pno}</JourneyID>
                 <TypeCode>3</TypeCode>
                 <Carrier>
-                    <Name>${mt.carrier}</Name>
+                    <Name>${mt.ext1}</Name>
                 </Carrier>
             </BorderTransportMeans>
         </Consignment>

@@ -2,18 +2,18 @@
     <Head>
         <MessageID>${msgId}</MessageID>
         <FunctionCode>2</FunctionCode>
-        <MessageType>${msessageType}</MessageType>
+        <MessageType>MT8205</MessageType>
         <SenderID>${senderId}</SenderID>
         <ReceiverID>${receiverID}</ReceiverID>
         <SendTime>${sendTime}</SendTime>
         <Version>1.0</Version>
     </Head>
     <Declaration>
-        <DeclarationOfficeID>${mt1201.customcode}</DeclarationOfficeID>
+        <DeclarationOfficeID>${mt8205.customcode}</DeclarationOfficeID>
         <Relation>
             <ImportInformation>
                 <RepresentativePerson>
-                    <Name>460470678920X</Name>
+                    <Name>${orgCode}</Name>
                 </RepresentativePerson>
                 <BorderTransportMeans>
                     <JourneyID>${mt1201.carrier}${mt1201.flightno}/${mt1201.flightdate?string('yyyyMMdd')}</JourneyID>
@@ -23,7 +23,7 @@
                         <ID>${mt1201.awba}</ID>
                     </TransportContractDocument>
                     <LoadingLocation>
-                        <ID>${mt1201.originstation}</ID>
+                        <ID>${mt8205.awboriginstation}</ID>
                     </LoadingLocation>
                     <ConsignmentPackaging>
                         <QuantityQuantity>${mt1201.piece}</QuantityQuantity>
@@ -39,7 +39,7 @@
             </ImportInformation>
             <ExportInformation>
                 <RepresentativePerson>
-                    <Name>460470678920X</Name>
+                    <Name>${orgCode}</Name>
                 </RepresentativePerson>
                 <BorderTransportMeans>
                     <JourneyID>${mt2201.carrier}${mt2201.flightno}/${mt2201.flightdate?string('yyyyMMdd')}</JourneyID>
@@ -49,13 +49,13 @@
                         <ID>${mt2201.awba}</ID>
                     </TransportContractDocument>
                     <UnloadingLocation>
-                        <ID>${mt2201.destinationstation}</ID>
+                        <ID>${mt8205.awbdesstation}</ID>
                     </UnloadingLocation>
                     <ConsignmentPackaging>
-                        <QuantityQuantity>${mt8205.transpiece}</QuantityQuantity>
-                        <TypeCode>${mt8205.goodspackage}</TypeCode>
+                        <QuantityQuantity>${mt2201.piece}</QuantityQuantity>
+                        <TypeCode>PK</TypeCode>
                     </ConsignmentPackaging>
-                    <TotalGrossMassMeasure>${mt8205.transweight}</TotalGrossMassMeasure>
+                    <TotalGrossMassMeasure>${mt2201.weight}</TotalGrossMassMeasure>
                 </Consignment>
             </ExportInformation>
         </Relation>

+<Manifest xmlns="urn:Declaration:datamodel:standard:CN:MT5202:1" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <Head>
+        <MessageID>${msgId}</MessageID>
+        <FunctionCode>3</FunctionCode>
+        <MessageType>MT6202</MessageType>
+        <SenderID>${senderId}</SenderID>
+        <ReceiverID>${receiverID}</ReceiverID>
+        <SendTime>${sendTime}</SendTime>
+        <Version>1.0</Version>
+    </Head>
+    <Declaration>
+        <BorderTransportMeans>
+            <JourneyID>${flightNo}/${flightDate}</JourneyID>
+        </BorderTransportMeans>
+        <Consignment>
+            <TransportContractDocument>
+                <ID>${awba}</ID>
+            </TransportContractDocument>
+        </Consignment>
+        <AdditionalInformation>
+            <Reason>${reason}</Reason>
+            <ContactName>${contactName}</ContactName>
+            <ContactTel>${contactTel}</ContactTel>
+        </AdditionalInformation>
+    </Declaration>
+</Manifest>
\ No newline at end of file