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

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

@@ -388,12 +388,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name", warehouseInOutInfo1.getGoodsName()).orderBy("update_date", false));
         if (CollectionUtils.isEmpty(weightedDetailsList)) {
-            Double newCost = (paymentManagement.getAmountIngPayable() ) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+            Double newCost = (paymentManagement.getAmountIngPayable()- paymentManagement.getAmountIngPayable()*0.09) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
             weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
             weightedDetails.setCostAfter(newCost);
         } else {
             weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
-            Double newCost = (paymentManagement.getAmountIngPayable() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+            Double newCost = ( (paymentManagement.getAmountIngPayable()- paymentManagement.getAmountIngPayable()*0.09) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
             weightedDetails.setCostAfter(newCost);
         }
         // 计算新加权成本

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

@@ -1005,10 +1005,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     Double newCost = 0d;
                     if (CollectionUtils.isEmpty(weightedDetailsList)) {
                         if ("干粮".equals(warehouseInOutInfo.getType())) {
-                            newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()))) / (Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
+                            newCost = ((warehouseInOutInfo.getCost()/1.09 + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()))) / (Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
 
                         } else {
-                            newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) ) / (warehouseInOutInfo.getPureWeight() + original);
+                            newCost = ((warehouseInOutInfo.getCost()/1.09 + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) ) / (warehouseInOutInfo.getPureWeight() + original);
 
                         }
                         weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
@@ -1016,10 +1016,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     } else {
                         weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
                         if ("干粮".equals(warehouseInOutInfo.getType())) {
-                            newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
+                            newCost = ((warehouseInOutInfo.getCost()/1.09 + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
 
                         } else {
-                            newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
+                            newCost = ((warehouseInOutInfo.getCost()/1.09 + warehouseInOutInfo.getFreight()) * Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
 
                         }
                         weightedDetails.setCostAfter(newCost);