wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 3a4d837a4e8965c128d889641b890711cc42d43a 1 个父辈 67d68bdc

删除报文 承运人问题 出港理货分单判断问题

内嵌 并排对比
正在显示 7 个修改的文件 包含 8 行增加 和 6 行删除
@@ -44,6 +44,7 @@ public class ReturnUtil { @@ -44,6 +44,7 @@ public class ReturnUtil {
44 nmmsCustomResponse.setCusfunctioncode(map.get("functionCode").toString()); 44 nmmsCustomResponse.setCusfunctioncode(map.get("functionCode").toString());
45 } 45 }
46 nmmsCustomResponse.setCusversion("1.0"); 46 nmmsCustomResponse.setCusversion("1.0");
  47 +
47 nmmsCustomResponse.setBusdate(new Date()); 48 nmmsCustomResponse.setBusdate(new Date());
48 if (map.containsKey("piece")){ 49 if (map.containsKey("piece")){
49 nmmsCustomResponse.setBuspiece(Integer.valueOf(map.get("piece").toString())); 50 nmmsCustomResponse.setBuspiece(Integer.valueOf(map.get("piece").toString()));
@@ -51,6 +52,7 @@ public class ReturnUtil { @@ -51,6 +52,7 @@ public class ReturnUtil {
51 if (map.containsKey("weight")){ 52 if (map.containsKey("weight")){
52 nmmsCustomResponse.setBusweight(new BigDecimal(map.get("weight").toString())); 53 nmmsCustomResponse.setBusweight(new BigDecimal(map.get("weight").toString()));
53 } 54 }
  55 +
54 nmmsCustomResponse.setBustype(map.get("busType").toString()); 56 nmmsCustomResponse.setBustype(map.get("busType").toString());
55 if (map.containsKey("awba")){ 57 if (map.containsKey("awba")){
56 nmmsCustomResponse.setAwbano(map.get("awba").toString()); 58 nmmsCustomResponse.setAwbano(map.get("awba").toString());
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <ID>${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 1>
33 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
34 <ID>${awba}_${mt.awbh}</ID> 34 <ID>${awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <Name>${orgCode}</Name> 13 <Name>${orgCode}</Name>
14 </RepresentativePerson> 14 </RepresentativePerson>
15 <BorderTransportMeans> 15 <BorderTransportMeans>
16 - <JourneyID>${flightNo}/${flightDates}</JourneyID> 16 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
17 </BorderTransportMeans> 17 </BorderTransportMeans>
18 <Consignment> 18 <Consignment>
19 <TransportContractDocument> 19 <TransportContractDocument>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <BorderTransportMeans> 12 <BorderTransportMeans>
13 - <JourneyID>${flightNo}/${flightDates}</JourneyID> 13 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <Declaration> 11 <Declaration>
12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${flightNo}/${flightDates}</JourneyID> 14 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <Declaration> 11 <Declaration>
12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID> 12 <DeclarationOfficeID>${customCode}</DeclarationOfficeID>
13 <BorderTransportMeans> 13 <BorderTransportMeans>
14 - <JourneyID>${flightNo}/${flightDates}</JourneyID> 14 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
15 </BorderTransportMeans> 15 </BorderTransportMeans>
16 <Consignment> 16 <Consignment>
17 <TransportContractDocument> 17 <TransportContractDocument>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </Head> 10 </Head>
11 <Declaration> 11 <Declaration>
12 <BorderTransportMeans> 12 <BorderTransportMeans>
13 - <JourneyID>${flightNo}/${flightDates}</JourneyID> 13 + <JourneyID>${carrier}${flightNo}/${flightDates}</JourneyID>
14 </BorderTransportMeans> 14 </BorderTransportMeans>
15 <Consignment> 15 <Consignment>
16 <TransportContractDocument> 16 <TransportContractDocument>