Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -170,8 +170,8 @@ public class BiInfoController {
 //            }
 //        }
         List<CostManagementInfo> costManagementInfos = costManagementInfoService.selectList(costManagementInfoEntityWrapper);
-        Float sumTotal = 0f;
-        Float sumCost = 0f;
+        Double sumTotal = 0d;
+        Double sumCost = 0d;
         if (CollectionUtils.isNotEmpty(costManagementInfos)) {
             for (int i = 0; i < costManagementInfos.size(); i++) {
                 CostManagementInfo costManagementInfo = costManagementInfos.get(i);
@@ -225,7 +225,7 @@ public class BiInfoController {
 //                    }
 //                }
                 List<CostManagementInfo> costManagementInfoList1 = costManagementInfoService.selectList(costManagementInfoEntityWrapper2);
-                Float weight = 0f;
+                Double weight = 0d;
                 for (int j = 0; j < costManagementInfoList1.size(); j++) {
                     CostManagementInfo costManagementInfo1 = costManagementInfoList1.get(j);
                     weight = weight + costManagementInfo1.getStorage();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CostManagementInfo.java

@@ -57,7 +57,7 @@ public class CostManagementInfo extends BaseModel<CostManagementInfo> {
     /**
      * 存储（吨）
      */
-    private Float storage;
+    private Double storage;
     /**
      * 价值
      */
@@ -65,7 +65,7 @@ public class CostManagementInfo extends BaseModel<CostManagementInfo> {
     /**
      * 加权成本
      */
-    private Float cost;
+    private Double cost;
     /**
      * 状态标识
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeightedDetails.java

@@ -98,7 +98,7 @@ public class WeightedDetails extends BaseModel<WeightedDetails> {
     /**
      * 入库后加权成本
      */
-    private Float costAfter;
+    private Double costAfter;
     /**
      * 状态标识
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -386,7 +386,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
         }
         // 计算新加权成本
-        Float newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+        Double newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
 
         weightedDetails.setCostAfter(newCost);
 
@@ -397,7 +397,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
         List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name_key", warehouseInOutInfo1.getGoodsNameKey()).orderBy("update_date", false));
-        Float net = 0f;
+        Double net = 0d;
         List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                 .eq("base_id", weightedDetails.getWarehouseId()));
         if (!CollectionUtils.isEmpty(warehousePositionInfos)) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -992,12 +992,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
                     }
                     // 计算新加权成本
-                    float newCost = 0f;
+                    Double newCost = 0d;
                     if ("干粮".equals(warehouseInOutInfo.getType())) {
-                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
+                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
 
                     } else {
-                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
+                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
 
                     }
                     weightedDetails.setCostAfter(newCost);
@@ -1009,7 +1009,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
 //                    List<WeightedDetails> weightedDetailsLists = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo.getWarehouseName())
 //                            .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()).orderBy("update_date", false));
-                    Float net = 0f;
+                    Double net = 0d;
 //                    for (int i = 0; i < weightedDetailsLists.size(); i++) {
 //                        net = net + weightedDetailsLists.get(i).getNetWeight();
 //                    }
@@ -1383,12 +1383,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
                                 .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
                         if (costManagementInfo != null) {
-                            warehouseInOutInfo.setWeightedCost(costManagementInfo.getCost());
+                            warehouseInOutInfo.setWeightedCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
                             warehouseInOutInfoService.updateById(warehouseInOutInfo);
                             TranCarInfo tranCarInfo1 = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                             if (tranCarInfo1 != null) {
                                 //打入出库成本
-                                tranCarInfo1.setCost(costManagementInfo.getCost());
+                                tranCarInfo1.setCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
                                 tranCarInfoService.updateById(tranCarInfo1);
                             }
                         }
@@ -1667,7 +1667,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
                                 .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
                         if (costManagementInfo != null) {
-                            warehouseInOutInfo.setWeightedCost(costManagementInfo.getCost());
+                            warehouseInOutInfo.setWeightedCost(Float.valueOf(String.valueOf(costManagementInfo.getCost())));
                             warehouseInOutInfoService.updateById(warehouseInOutInfo);
                         }
 //                        Float storage =0f;