wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

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

生成报文 主单号带 - 问题

内嵌 并排对比
正在显示 28 个修改的文件 包含 113 行增加 和 37 行删除
... ... @@ -58,6 +58,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
map.put("sendTime", DateUtil.getCurrentTime17());
// 舱单传输人名称
map.put("orgCode", orgCode);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
// 生成报文
Map<String, Object> hashMap = new HashMap<>();
// 生成报文
... ... @@ -101,6 +106,11 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
// 封装实体
map.put("mt", customMt1201);
map.put("awbAwbinfo", awbAwbinfo);
// 处理主单号-
String awba = ReturnUtil.awbaReplace(customMt1201.getAwba());
map.put("awba", awba);
// 生成报文头部
String msgId = makeMsgID("MT1201", orgsn, customMt1201.getAwba());
String senderId = makeSenderID(customCode, orgsn, "");
... ...
... ... @@ -89,7 +89,9 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
map.put("sendTime", DateUtil.getCurrentTime17());
// 舱单传输人名称
map.put("orgCode", orgCode);
// 处理主单号-
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
Map<String, Object> hashMap = new HashMap<>();
// 生成报文
if (makeXmlToFile("/remove/MT2201.ftlx", msgId+".xml", map, "./send/remove/")>0){
... ... @@ -124,6 +126,11 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
// 封装实体
map.put("mt", custom_mt2201);
map.put("awbAwbinfo", awbAwbinfo);
// 处理主单号-
String awba = ReturnUtil.awbaReplace(custom_mt2201.getAwba());
map.put("awba", awba);
// 生成报文头部
String msgId = makeMsgID("MT2201", orgsn, custom_mt2201.getAwba());
String senderId = makeSenderID(customCode, orgsn, "");
... ...
... ... @@ -35,6 +35,9 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
String customCode = customMt3201.getCustomcode();
// 报文头时间 精确到毫秒
map.put("sendTime", DateUtil.getCurrentTime17());
String awba = ReturnUtil.awbaReplace(customMt3201.getAwba());
map.put("awba", awba);
// 封装实体
map.put("mt", customMt3201);
// 生成报文头部
... ... @@ -97,6 +100,10 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
map.put("msgId", msgId);
map.put("senderId", senderId);
map.put("receiverID", receiverID);
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
Map<String, Object> map3201 = new HashMap<>();
if (makeXmlToFile("/remove/MT3201.ftlx", msgId+".xml", map,"./send/remove/")>0){
map.put("functionCode", "3");
... ...
... ... @@ -34,6 +34,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
map.put("sendTime", DateUtil.getCurrentTime17());
// 封装实体
map.put("mt", nmmsCustomTrans);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(nmmsCustomTrans.getAwba());
map.put("awba", awba);
// 生成报文头部
String msgId = makeMsgID("MT3202", orgsn, nmmsCustomTrans.getAwba());
String msessageType = "MT3202";
... ... @@ -89,6 +94,11 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
map.put("msgId", msgId);
map.put("senderId", senderId);
map.put("receiverID", receiverID);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
Map<String, Object> map3201 = new HashMap<>();
if (makeXmlToFile("/remove/MT3202.ftlx", msgId+".xml", map,"./send/remove/")>0){
map.put("functionCode", "3");
... ...
... ... @@ -37,7 +37,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
map.put("sendTime", DateUtil.getCurrentTime17());
// 封装实体
map.put("mt", customMt4201);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(customMt4201.getAwba());
map.put("awba", awba);
// 生成报文头部
String msgId = makeMsgID("MT4201", orgsn, customMt4201.getAwba());
String senderId = makeSenderID(customCode, orgsn);
... ... @@ -99,6 +101,9 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
map.put("msgId", msgId);
map.put("senderId", senderId);
map.put("receiverID", receiverID);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
Map<String, Object> map4201 = new HashMap<>();
if (makeXmlToFile("/remove/MT4201.ftlx", msgId+".xml", map, "./send/remove/")>0){
map.put("functionCode", "3");
... ...
... ... @@ -34,12 +34,16 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
Map<String, Object> hashMap = new HashMap();
// 处理主单号-
String awba = ReturnUtil.awbaReplace(customMt520X.getAwba());
hashMap.put("awba", awba);
// 关区代码
String customCode = customMt520X.getCustomcode();
// 报文头时间 精确到毫秒
hashMap.put("sendTime", DateUtil.getCurrentTime17());
// 封装实体
hashMap.put("mt", customMt520X);
hashMap.put("orgCode", orgCode);
if ("MT5201".equals(customMt520X.getRcfdep())){
// 生成报文头部
... ... @@ -51,6 +55,7 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
hashMap.put("msessageType", msessageType);
hashMap.put("senderId", senderId);
hashMap.put("receiverID", receiverID);
Map<String, Object> maps = new HashMap<>();
if (makeXmlToFile("/manifest/MT5201.ftlx", msgId+".xml", hashMap, "./send/add/")>0){
... ... @@ -143,6 +148,11 @@ public class MT520XServiceImp extends CustomXmlMaker implements MT520XService{
map.put("customCode", customCode);
// 报文头时间 精确到毫秒
map.put("sendTime", DateUtil.getCurrentTime17());
// 处理主单号-
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
if ("MT5201".equals(map.get("rcfdep").toString())){
// 生成报文头部
String msgId = makeMsgID("MT5201", orgsn, map.get("awba").toString());
... ...
... ... @@ -33,6 +33,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
map.put("sendTime", DateUtil.getCurrentTime17());
// 封装实体
map.put("mt", nmmsCustomTrans);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(nmmsCustomTrans.getAwba());
map.put("awba", awba);
// 生成报文头部
String msgId = makeMsgID("MT6202", orgsn, nmmsCustomTrans.getAwba());
String msessageType = "MT6202";
... ... @@ -88,6 +93,11 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
map.put("msgId", msgId);
map.put("senderId", senderId);
map.put("receiverID", receiverID);
// 处理主单号 -
String awba = ReturnUtil.awbaReplace(map.get("awba").toString());
map.put("awbas", awba);
Map<String, Object> map3201 = new HashMap<>();
if (makeXmlToFile("/remove/MT6202.ftlx", msgId+".xml", map,"./send/remove/")>0){
map.put("functionCode", "3");
... ...
... ... @@ -46,6 +46,15 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
map.put("mt1201", customMt1201);
map.put("mt2201", customMt2201);
map.put("orgCode", orgCode);
// 处理主单号 -
String mt1201 = ReturnUtil.awbaReplace(customMt1201.getAwba());
map.put("mt1201", mt1201);
// 处理主单号 -
String mt2201 = ReturnUtil.awbaReplace(customMt2201.getAwba());
map.put("mt2201", mt2201);
// 生成报文头部
String msgId = makeMsgID("MT8205", orgsn, customMt1201.getAwba());
String msessageType = "MT8205";
... ...
... ... @@ -89,6 +89,14 @@ public class ReturnUtil {
return nmmsCustomResponse;
}
/**
* 替换主单号带-
* @param awba
* @return
*/
public static String awbaReplace(String awba){
return awba.replace("-","");
}
}
... ...
... ... @@ -27,14 +27,14 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
<ChangeReasonCode>999</ChangeReasonCode>
<ConditionCode>10</ConditionCode>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -25,14 +25,14 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
<ChangeReasonCode>9999</ChangeReasonCode>
<ConditionCode>10</ConditionCode>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -27,13 +27,13 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
<ConditionCode>10</ConditionCode>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -24,13 +24,13 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
<ConditionCode>10</ConditionCode>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -18,16 +18,16 @@
</BorderTransportMeans>
<UnloadingLocation>
<ID>${mt.destinationstation}/${mt.customcode}</ID>
<ArrivalDate>${mt.arrivetime?string('yyyyMMddHHmmss')}</ArrivalDate>
<ArrivalDate>${mt.arrivetime?string("yyyyMMdd")}</ArrivalDate>
</UnloadingLocation>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -21,7 +21,7 @@
</UnloadingLocation>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<ConsignmentPackaging>
<QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
... ...
... ... @@ -20,12 +20,12 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -26,12 +26,12 @@
</TallyParty>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -26,12 +26,12 @@
</TallyParty>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<#if mt['awbh']??>
<#if mt.awbh?default("")?length gt 11>
<AssociatedTransportDocument>
<ID>${mt.awba}_${mt.awbh}</ID>
<ID>${awba}_${mt.awbh}</ID>
</AssociatedTransportDocument>
</#if>
</#if>
... ...
... ... @@ -20,7 +20,7 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt.awba}</ID>
<ID>${awba}</ID>
</TransportContractDocument>
<ConsignmentPackaging>
<QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
... ...
... ... @@ -20,7 +20,7 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt1201.awba}</ID>
<ID>${mt1201awba}</ID>
</TransportContractDocument>
<LoadingLocation>
<ID>${mt8205.awboriginstation}</ID>
... ... @@ -46,7 +46,7 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${mt2201.awba}</ID>
<ID>${mt2201awba}</ID>
</TransportContractDocument>
<UnloadingLocation>
<ID>${mt8205.awbdesstation}</ID>
... ...
... ... @@ -17,12 +17,12 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
<ChangeReasonCode>999</ChangeReasonCode>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -18,12 +18,12 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
<ChangeReasonCode>9999</ChangeReasonCode>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -15,11 +15,11 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -14,7 +14,7 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
</Consignment>
<AdditionalInformation>
... ...
... ... @@ -14,11 +14,11 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -15,11 +15,11 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -15,11 +15,11 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
<#if awbh?default("")?length gt 1>
<AssociatedTransportDocument>
<ID>${awba}_${awbh}</ID>
<ID>${awbas}_${awbh}</ID>
</AssociatedTransportDocument>
</#if>
</Consignment>
... ...
... ... @@ -14,7 +14,7 @@
</BorderTransportMeans>
<Consignment>
<TransportContractDocument>
<ID>${awba}</ID>
<ID>${awbas}</ID>
</TransportContractDocument>
</Consignment>
<AdditionalInformation>
... ...