[CODE]:首页图并柱状图 结余数/1000

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -134,11 +134,16 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         if(null!=whouseList && whouseList.size()>0){
             String fid = null; //获取 第一个 仓库ID
             for(Map<String, Object> m : whouseList){
+                String fGrossweightblc = null;
                 for (String k : m.keySet()){
                     if(k.equals("fWarehouseid")){
                         fid= m.get(k).toString();
                     }
+                    if(k.equals("fGrossweightD")){
+                        fGrossweightblc=  m.get(k).toString();
+                    }
                 }
+                m.put("fGrossweightD",calculation2(fGrossweightblc,"1000"));
                 break;
             }
             //通过ID 查询仓库下 所有的 商品
@@ -156,7 +161,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                     }
                 }
                 m.put("balance",calculation1(fTotalgross,fGrossweightblc));
-                m.put("fGrossweightD",new BigDecimal(fGrossweightblc).setScale(2,BigDecimal.ROUND_HALF_UP) );
+                m.put("fGrossweightD",calculation2(fGrossweightblc,"1000"));
             }
             map.put("goodslistWhouse", goodslistWhouse);
             // 查询仓库下 所有的 客户
@@ -175,7 +180,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                     }
                 }
                 m.put("balance",calculation1(fTotalgross,fGrossweightblc));
-                m.put("fGrossweightD",new BigDecimal(fGrossweightblc).setScale(2,BigDecimal.ROUND_HALF_UP) );
+                m.put("fGrossweightD",calculation2(fGrossweightblc,"1000"));
             }
             map.put("corpsListWhouse", corpsListWhouse);
             // 仓库
@@ -211,6 +216,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                     }
                 }
                 m.put("percentage",calculation(fGrossweightblc,fTotalgross));
+                m.put("fGrossweightD",calculation2(fGrossweightblc,"1000"));
             }
         } else {
             List<TWarehouse> tWarehouses= tWarehouseMapper.selectTWarehouseList(new TWarehouse());
@@ -371,6 +377,19 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
     }
 
     /**
+     *   结余数/1000
+     * @param fTotalgross
+     * @param fGrossweightblc
+     * @return
+     */
+    public static String  calculation2(String  fTotalgross, String fGrossweightblc){
+        BigDecimal num1 = new BigDecimal(fTotalgross);
+        BigDecimal num2 = new BigDecimal(fGrossweightblc);
+        BigDecimal result = num1.divide(num2,2,BigDecimal.ROUND_HALF_UP);
+        return result.toString();
+    }
+
+    /**
      *   库容-结余毛重
      * @param fTotalgross
      * @param fGrossweightblc