Merge remote-tracking branch 'origin/master-weblogic' into master-weblogic

@@ -281,9 +281,12 @@ public class ChmConsignmentDetailService {
     public  BigDecimal bigDecimalFormat(BigDecimal num){
         BigDecimal bdForMat = null;
         if(num !=null){
-            bdForMat = num.setScale(2, BigDecimal.ROUND_HALF_UP);
-            if(bdForMat.compareTo(BigDecimal.ZERO) == 0){
+            if(num.compareTo(BigDecimal.ZERO) == 0){
+                bdForMat = new BigDecimal(0);
+            }else if(num.compareTo(new BigDecimal("0.01"))< 1) {
                 bdForMat = new BigDecimal(0.01).setScale(2,BigDecimal.ROUND_HALF_UP);
+            }else{
+                bdForMat = num.setScale(2, BigDecimal.ROUND_HALF_UP);
             }
         }
         return  bdForMat;

@@ -81,17 +81,17 @@ public class FedexService {
         //运单号-->提单号
         fedexMawb.setBillNo(fedexc.getConsignmentCode());
         //经营单位 --> 消费使用/生产销售单位名称
-        fedexMawb.setOwnerName(fedexc.getOperateUnitName());
+        fedexMawb.setOwnerName(fedexc.getSender());
         //经营单位海关编码 --> 消费使用/生产销售单位代码
-        fedexMawb.setOwnerCode(fedexc.getOperateUnitCode());
+        fedexMawb.setOwnerCode(fedexc.getShipperCustomsCode());
         //经营单位社会信用证代码 --> 消费使用/生产销售单位单位统一编码
-        fedexMawb.setOwnerCodeScc(fedexc.getOperateSCC());
+        fedexMawb.setOwnerCodeScc(fedexc.getShipperSCC());
         //发件人 --> 境内收发货人名称
-        fedexMawb.setTradeName(fedexc.getSender());
+        fedexMawb.setTradeName(fedexc.getOperateUnitName());
         //发件人海关编码 --> 境内收发货人编号
-        fedexMawb.setTradeCode(fedexc.getShipperCustomsCode());
+        fedexMawb.setTradeCode(fedexc.getOperateUnitCode());
         //发件人社会信用证代码 --> 生产核销单位统一信用代码---报关形式类型
-        fedexMawb.setTradeCodeScc(fedexc.getShipperSCC());
+        fedexMawb.setTradeCodeScc(fedexc.getOperateSCC());
 
         fedexMawb.setEanNo(fedexc.getEanNo());
         //明细