0

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -107,6 +107,7 @@ public class BiInfoController {
                         if (warehouseBaseInfo != null && warehouseBaseInfo1 != null) {
                             biViewInfo.setStartPlace(warehouseBaseInfo.getWarehousePositioning());
                             biViewInfo.setEndPlace(warehouseBaseInfo1.getWarehousePositioning());
+                            biViewInfo.setName(warehouseBaseInfo.getWarehouseName()+" → "+warehouseBaseInfo1.getWarehouseName()+"  在途");
                             biViewInfoList.add(biViewInfo);
                         }
 
@@ -118,6 +119,7 @@ public class BiInfoController {
                         if (contractManagementInfo != null) {
                             biViewInfo.setStartPlace(contractManagementInfo.getSourceLocation());
                             biViewInfo.setEndPlace(contractManagementInfo.getDeliveryLocation());
+                            biViewInfo.setName(contractManagementInfo.getSourceCity()+" → "+contractManagementInfo.getDeliveryCity()+"  在途");
                             biViewInfoList.add(biViewInfo);
                         }
                     }
@@ -157,7 +159,8 @@ public class BiInfoController {
         biViewInfo1.setName("总库存量");
         biViewInfo1.setCount(String.valueOf(sumTotal));
         biViewInfo2.setName("库存价值");
-        biViewInfo2.setCount(String.valueOf(sumCost));
+        BigDecimal bg = new BigDecimal(sumCost);
+        biViewInfo2.setCount(String.valueOf(bg));
         biViewInfoList.add(biViewInfo1);
         biViewInfoList.add(biViewInfo2);
         biViewInfo.setBiViewInfoList(biViewInfoList);
@@ -329,11 +332,13 @@ public class BiInfoController {
         List<BiViewInfo> biViewInfosa1 = new ArrayList<>();
         BiViewInfo biViewInfoa1 = new BiViewInfo();
         biViewInfoa1.setName("已开票");
-        biViewInfoa1.setCount(String.valueOf(invoicingTotal));
+        BigDecimal bg12= new BigDecimal(invoicingTotal);
+        biViewInfoa1.setCount(String.valueOf(bg12));
         biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "%" : 0 + "%");
         BiViewInfo biViewInfoa2 = new BiViewInfo();
         biViewInfoa2.setName("待开票");
-        biViewInfoa2.setCount(String.valueOf(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)));
+        BigDecimal bg00= new BigDecimal(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0));
+        biViewInfoa2.setCount(String.valueOf(bg00));
         biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "%");
         biViewInfosa1.add(biViewInfoa1);
         biViewInfosa1.add(biViewInfoa2);
@@ -348,11 +353,13 @@ public class BiInfoController {
         List<BiViewInfo> biViewInfosb1 = new ArrayList<>();
         BiViewInfo biViewInfob1 = new BiViewInfo();
         biViewInfob1.setName("已付款");
-        biViewInfob1.setCount(String.valueOf(payTotal));
+        BigDecimal bg45= new BigDecimal(payTotal);
+        biViewInfob1.setCount(String.valueOf(bg45));
         biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "%" : 0 + "%");
         BiViewInfo biViewInfob2 = new BiViewInfo();
         biViewInfob2.setName("待付款");
-        biViewInfob2.setCount(String.valueOf(moneyTotal - (payTotal != null ? payTotal : 0)));
+        BigDecimal bg4 = new BigDecimal(moneyTotal - (payTotal != null ? payTotal : 0));
+        biViewInfob2.setCount(String.valueOf(bg4));
         biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "%");
         biViewInfosb1.add(biViewInfoa1);
         biViewInfosb1.add(biViewInfoa2);
@@ -477,11 +484,13 @@ public class BiInfoController {
         List<BiViewInfo> biViewInfosa1 = new ArrayList<>();
         BiViewInfo biViewInfoa1 = new BiViewInfo();
         biViewInfoa1.setName("已开票");
-        biViewInfoa1.setCount(String.valueOf(invoicingTotal));
+        BigDecimal bg45= new BigDecimal(invoicingTotal);
+        biViewInfoa1.setCount(String.valueOf(bg45));
         biViewInfoa1.setPercentage(invoicingTotal != 0 ? invoicingTotal / moneyTotal * 100 + "%" : 0 + "%");
         BiViewInfo biViewInfoa2 = new BiViewInfo();
         biViewInfoa2.setName("待开票");
-        biViewInfoa2.setCount(String.valueOf(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)));
+        BigDecimal bg4= new BigDecimal(moneyTotal - (invoicingTotal != null ? invoicingTotal : 0));
+        biViewInfoa2.setCount(String.valueOf(bg4));
         biViewInfoa2.setPercentage((moneyTotal - (invoicingTotal != null ? invoicingTotal : 0)) / moneyTotal * 100 + "%");
         biViewInfosa1.add(biViewInfoa1);
         biViewInfosa1.add(biViewInfoa2);
@@ -496,11 +505,13 @@ public class BiInfoController {
         List<BiViewInfo> biViewInfosb1 = new ArrayList<>();
         BiViewInfo biViewInfob1 = new BiViewInfo();
         biViewInfob1.setName("已付款");
-        biViewInfob1.setCount(String.valueOf(payTotal));
+        BigDecimal bg9= new BigDecimal(payTotal);
+        biViewInfob1.setCount(String.valueOf(bg9));
         biViewInfob1.setPercentage(payTotal != 0 ? payTotal / moneyTotal * 100 + "%" : 0 + "%");
         BiViewInfo biViewInfob2 = new BiViewInfo();
         biViewInfob2.setName("待付款");
-        biViewInfob2.setCount(String.valueOf(moneyTotal - (payTotal != null ? payTotal : 0)));
+        BigDecimal bg6= new BigDecimal(moneyTotal - (payTotal != null ? payTotal : 0));
+        biViewInfob2.setCount(String.valueOf(bg6));
         biViewInfob2.setPercentage((moneyTotal - (payTotal != null ? payTotal : 0)) / moneyTotal * 100 + "%");
         biViewInfosb1.add(biViewInfoa1);
         biViewInfosb1.add(biViewInfoa2);