结算

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

@@ -382,12 +382,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.getGrainMoney() ) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+            Double newCost = (paymentManagement.getAmountIngPayable() ) / (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.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
+            Double newCost = (paymentManagement.getAmountIngPayable() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
             weightedDetails.setCostAfter(newCost);
         }
         // 计算新加权成本