md

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -1958,10 +1958,28 @@ public class EmisBaseService {
          extData.put("pickupMethod",pickupMethod);
 
 
-         extData.put("freight",waybill.getFreight());
+
          extData.put("feeRemark",WaybillHelper.removeUnSeeChar(waybill.getFeeRemark()));
-         extData.put("volumeWeight",waybill.getVolumeWeight());
-         extData.put("settlementWeight",waybill.getSettlementWeight());
+
+         String freight="0.0";
+         String volumeWeight="0.0";
+         String settlementWeight="0.0";
+
+         if(waybill.getFreight()!=null){
+             freight=waybill.getFreight().stripTrailingZeros().toPlainString();
+         }
+
+         if(waybill.getVolumeWeight()!=null){
+             volumeWeight=waybill.getVolumeWeight().stripTrailingZeros().toPlainString();
+         }
+
+         if(waybill.getSettlementWeight()!=null){
+             settlementWeight=waybill.getSettlementWeight().stripTrailingZeros().toPlainString();
+         }
+
+         extData.put("freight",freight);
+         extData.put("volumeWeight",volumeWeight);
+         extData.put("settlementWeight",settlementWeight);
 
          extData.put("takePieceEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getTakePieceEmployeeName()));
          extData.put("operateEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getOperateEmployeeName()));