wlxxpt / CUSTOM-XML-BUILDER · 提交

转到一个项目

作者 shenhailong
提交 49c4a5b73ceba71e141884bc8ed37b007d413f82 1 个父辈 c1d56b36

优化 报文生成格式 分单节点问题

内嵌 并排对比
正在显示 5 个修改的文件 包含 10 行增加 和 8 行删除
@@ -30,11 +30,13 @@ @@ -30,11 +30,13 @@
30 <ID>${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("")?trim?length gt 0>
34 <AssociatedTransportDocument> 35 <AssociatedTransportDocument>
35 <ID>${awba}_${mt.awbh}</ID> 36 <ID>${awba}_${mt.awbh}</ID>
36 </AssociatedTransportDocument> 37 </AssociatedTransportDocument>
37 </#if> 38 </#if>
  39 + </#if>
38 <LoadingLocation> 40 <LoadingLocation>
39 <ID>${mt.originstation}</ID> 41 <ID>${mt.originstation}</ID>
40 </LoadingLocation> 42 </LoadingLocation>
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <ID>${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("")?trim?length gt 0>
29 <AssociatedTransportDocument> 29 <AssociatedTransportDocument>
30 <ID>${awba}_${mt.awbh}</ID> 30 <ID>${awba}_${mt.awbh}</ID>
31 </AssociatedTransportDocument> 31 </AssociatedTransportDocument>
@@ -43,4 +43,4 @@ @@ -43,4 +43,4 @@
43 </ConsignmentItem> 43 </ConsignmentItem>
44 </Consignment> 44 </Consignment>
45 </Declaration> 45 </Declaration>
46 -</Manifest>  
  46 +</Manifest>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <ID>${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("")?trim?length gt 0>
27 <AssociatedTransportDocument> 27 <AssociatedTransportDocument>
28 <ID>${awba}_${mt.awbh}</ID> 28 <ID>${awba}_${mt.awbh}</ID>
29 </AssociatedTransportDocument> 29 </AssociatedTransportDocument>
@@ -45,4 +45,4 @@ @@ -45,4 +45,4 @@
45 </ConsignmentItem> 45 </ConsignmentItem>
46 </Consignment> 46 </Consignment>
47 </Declaration> 47 </Declaration>
48 -</Manifest>  
  48 +</Manifest>
@@ -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 1> 32 + <#if mt.awbh?default("")?trim?length gt 0>
33 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
34 <ID>${awba}_${mt.awbh}</ID> 34 <ID>${awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
@@ -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 1> 32 + <#if mt.awbh?default("")?trim?length gt 0>
33 <AssociatedTransportDocument> 33 <AssociatedTransportDocument>
34 <ID>${awba}_${mt.awbh}</ID> 34 <ID>${awba}_${mt.awbh}</ID>
35 </AssociatedTransportDocument> 35 </AssociatedTransportDocument>
@@ -41,4 +41,4 @@ @@ -41,4 +41,4 @@
41 <TotalGrossMassMeasure>${mt.weight?c}</TotalGrossMassMeasure> 41 <TotalGrossMassMeasure>${mt.weight?c}</TotalGrossMassMeasure>
42 </Consignment> 42 </Consignment>
43 </Declaration> 43 </Declaration>
44 -</Manifest>  
  44 +</Manifest>