更改 重量 Long 类型

@@ -11,7 +11,6 @@ spring:
   mvc:
     #静态资源，设置上传文件的访问，
     static-path-pattern: /**
-
   resources:
     static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
 
@@ -138,4 +137,3 @@ custom:
 tcs:
   mq-number: DXPENT0000460002
 
-

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 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;
@@ -131,7 +132,7 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
                     // 件数
                     nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt1201.getPiece().toString()));
                     // 重量
-                    nmmsCustomResponse.setBusweight(Long.valueOf(customMt1201.getWeight().toString()));
+                    nmmsCustomResponse.setBusweight(new BigDecimal(customMt1201.getWeight().toString()));
                     // 操作类型
                     nmmsCustomResponse.setOpertype("新增");
                     nmmsCustomResponse.setCusrescode("23");
@@ -161,7 +162,7 @@ public class MT1201ServiceImp extends CustomXmlMaker implements MT1201Service{
                     // 件数
                     nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt1201.getPiece().toString()));
                     // 重量
-                    nmmsCustomResponse.setBusweight(Long.valueOf(customMt1201.getWeight().toString()));
+                    nmmsCustomResponse.setBusweight(new BigDecimal(customMt1201.getWeight().toString()));
                     // 操作类型
                     nmmsCustomResponse.setOpertype("修改");
                     nmmsCustomResponse.setCusrescode("25");

@@ -161,7 +161,7 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
                 // 件数
                 nmmsCustomResponse.setBuspiece(Integer.valueOf(custom_mt2201.getPiece().toString()));
                 // 重量
-                nmmsCustomResponse.setBusweight(Long.valueOf(custom_mt2201.getWeight().toString()));
+                nmmsCustomResponse.setBusweight(new BigDecimal(custom_mt2201.getWeight().toString()));
                 // 操作类型
                 nmmsCustomResponse.setOpertype("新增");
                 nmmsCustomResponse.setCusrescode("23");
@@ -191,7 +191,7 @@ public class MT2201ServiceImp extends CustomXmlMaker implements MT2201Service {
                 // 件数
                 nmmsCustomResponse.setBuspiece(Integer.valueOf(custom_mt2201.getPiece().toString()));
                 // 重量
-                nmmsCustomResponse.setBusweight(Long.valueOf(custom_mt2201.getWeight().toString()));
+                nmmsCustomResponse.setBusweight(new BigDecimal(custom_mt2201.getWeight().toString()));
                 // 操作类型
                 nmmsCustomResponse.setOpertype("修改");
                 nmmsCustomResponse.setCusrescode("25");

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,7 +69,7 @@ public class MT3201ServiceImp extends CustomXmlMaker implements MT3201Service {
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt3201.getPiece().toString()));
             // 重量
-            nmmsCustomResponse.setBusweight(Long.valueOf(customMt3201.getWeight().toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(customMt3201.getWeight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
             nmmsCustomResponse.setCusrescode("23");

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
@@ -60,7 +61,7 @@ public class MT3202ServiceImp extends CustomXmlMaker implements MT3202Service {
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(nmmsCustomTrans.getTurnpiece().toString()));
             // 重量
-            nmmsCustomResponse.setBusweight(Long.valueOf(nmmsCustomTrans.getTurnweight().toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(nmmsCustomTrans.getTurnweight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
             nmmsCustomResponse.setCusrescode("23");

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import javax.xml.crypto.Data;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
@@ -69,7 +70,7 @@ public class MT4201ServiceImp extends CustomXmlMaker implements MT4201Service {
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt4201.getLodingpiece().toString()));
             // 重量
-            nmmsCustomResponse.setBusweight(Long.valueOf(customMt4201.getLodingweight().toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(customMt4201.getLodingweight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
             nmmsCustomResponse.setCusrescode("23");

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
@@ -59,7 +60,7 @@ public class MT6202ServiceImp extends CustomXmlMaker implements MT6202Service{
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(nmmsCustomTrans.getTurnpiece().toString()));
             // 重量
-            nmmsCustomResponse.setBusweight(Long.valueOf(nmmsCustomTrans.getTurnweight().toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(nmmsCustomTrans.getTurnweight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
             nmmsCustomResponse.setCusrescode("23");

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
@@ -75,7 +76,7 @@ public class MT8205ServiceImp extends CustomXmlMaker implements MT8205Service {
             // 件数
             nmmsCustomResponse.setBuspiece(Integer.valueOf(customMt1201.getPiece().toString()));
             // 重量
-            nmmsCustomResponse.setBusweight(Long.valueOf(customMt1201.getWeight().toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(customMt1201.getWeight().toString()));
             // 操作类型
             nmmsCustomResponse.setOpertype("新增");
             nmmsCustomResponse.setCusrescode("23");

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.message.builder.util;
 
 import com.sunyo.wlpt.base.model.NMMS_CUSTOM_RESPONSE;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -48,7 +49,7 @@ public class ReturnUtil {
             nmmsCustomResponse.setBuspiece(Integer.valueOf(map.get("piece").toString()));
         }
         if (map.containsKey("weight")){
-            nmmsCustomResponse.setBusweight(Long.valueOf(map.get("weight").toString()));
+            nmmsCustomResponse.setBusweight(new BigDecimal(map.get("weight").toString()));
         }
         nmmsCustomResponse.setBustype(map.get("busType").toString());
         if (map.containsKey("awba")){

@@ -53,7 +53,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${awbAwbinfo.weight?c}</TotalGrossMassMeasure>
             <Consignee>
                 <Name>${awbAwbinfo.cnsnname}</Name>
                 <Address>
@@ -85,7 +85,7 @@
                     <CargoDescription>${mt.goodsname}</CargoDescription>
                 </Commodity>
                 <GoodsMeasure>
-                    <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
+                    <GrossMassMeasure>${mt.weight?c}</GrossMassMeasure>
                 </GoodsMeasure>
             </ConsignmentItem>
         </Consignment>

@@ -54,7 +54,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${awbAwbinfo.weight?c}</TotalGrossMassMeasure>
             <Consignee>
                 <Name>${awbAwbinfo.cnsnname}</Name>
                 <Address>
@@ -85,7 +85,7 @@
                     <CargoDescription>${mt.goodsname}</CargoDescription>
                 </Commodity>
                 <GoodsMeasure>
-                    <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
+                    <GrossMassMeasure>${mt.weight?c}</GrossMassMeasure>
                 </GoodsMeasure>
             </ConsignmentItem>
         </Consignment>

@@ -53,7 +53,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${awbAwbinfo.weight?c}</TotalGrossMassMeasure>
             <Consignee>
                 <Name>${awbAwbinfo.cnsnname}</Name>
                 <Address>
@@ -85,7 +85,7 @@
                     <CargoDescription>${mt.goodsname}</CargoDescription>
                 </Commodity>
                 <GoodsMeasure>
-                    <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
+                    <GrossMassMeasure>${mt.weight?c}</GrossMassMeasure>
                 </GoodsMeasure>
             </ConsignmentItem>
         </Consignment>

@@ -50,7 +50,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${awbAwbinfo.pcs}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${awbAwbinfo.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${awbAwbinfo.weight?c}</TotalGrossMassMeasure>
             <Consignee>
                 <Name>${awbAwbinfo.cnsnname}</Name>
                 <Address>
@@ -80,7 +80,7 @@
                     <CargoDescription>${mt.goodsname}</CargoDescription>
                 </Commodity>
                 <GoodsMeasure>
-                    <GrossMassMeasure>${mt.weight}</GrossMassMeasure>
+                    <GrossMassMeasure>${mt.weight?c}</GrossMassMeasure>
                 </GoodsMeasure>
             </ConsignmentItem>
         </Consignment>

@@ -32,7 +32,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.piece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.weight?c}</TotalGrossMassMeasure>
             <ConsignmentItem>
                 <SequenceNumeric>1</SequenceNumeric>
                 <Commodity>

@@ -26,7 +26,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.turnweight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.turnweight?c}</TotalGrossMassMeasure>
             <ConsignmentItem>
                 <SequenceNumeric>1</SequenceNumeric>
                 <Commodity>

@@ -34,7 +34,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.lodingpiece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.lodingweight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.lodingweight?c}</TotalGrossMassMeasure>
             <TransportSplitIndicator>0</TransportSplitIndicator>
             <ConsignmentItem>
                 <Commodity>

@@ -28,7 +28,7 @@
             <TransportContractDocument>
                 <ID>${mt.awba}</ID>
             </TransportContractDocument>
-        <#if mt.awbh?length gt 1>
+        <#if mt.awbh?default("")?length gt 1>
             <AssociatedTransportDocument>
                 <ID>${mt.awba}_${mt.awbh}</ID>
             </AssociatedTransportDocument>
@@ -36,7 +36,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.piece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.weight?c}</TotalGrossMassMeasure>
         </Consignment>
     </Declaration>
 </Manifest>
\ No newline at end of file

@@ -38,7 +38,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.piece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.weight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.weight?c}</TotalGrossMassMeasure>
         </Consignment>
     </Declaration>
 </Manifest>
\ No newline at end of file

@@ -25,7 +25,7 @@
             <ConsignmentPackaging>
                 <QuantityQuantity>${mt.turnpiece}</QuantityQuantity>
             </ConsignmentPackaging>
-            <TotalGrossMassMeasure>${mt.turnweight}</TotalGrossMassMeasure>
+            <TotalGrossMassMeasure>${mt.turnweight?c}</TotalGrossMassMeasure>
             <BorderTransportMeans>
                 <JourneyID>${mt.pno}</JourneyID>
                 <TypeCode>3</TypeCode>

@@ -29,7 +29,7 @@
                         <QuantityQuantity>${mt1201.piece}</QuantityQuantity>
                         <TypeCode>PK</TypeCode>
                     </ConsignmentPackaging>
-                    <TotalGrossMassMeasure>${mt1201.weight}</TotalGrossMassMeasure>
+                    <TotalGrossMassMeasure>${mt1201.weight?c}</TotalGrossMassMeasure>
                     <ConsignmentItem>
                         <Commodity>
                             <CargoDescription>${mt1201.goodsname}</CargoDescription>
@@ -55,7 +55,7 @@
                         <QuantityQuantity>${mt2201.piece}</QuantityQuantity>
                         <TypeCode>PK</TypeCode>
                     </ConsignmentPackaging>
-                    <TotalGrossMassMeasure>${mt2201.weight}</TotalGrossMassMeasure>
+                    <TotalGrossMassMeasure>${mt2201.weight?c}</TotalGrossMassMeasure>
                 </Consignment>
             </ExportInformation>
         </Relation>