1

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

@@ -377,19 +377,23 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
         weightedDetails.setFreight(warehouseInOutInfo1.getFreight());
         weightedDetails.setOriginalStock(original);
+
         // 查询入库全加权成本
         List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo1.getBaseId())
                 .eq("goods_name", warehouseInOutInfo1.getGoodsName()).orderBy("update_date", false));
-       
-        // 计算新加权成本
-        Double newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
-
-        weightedDetails.setCostAfter(newCost);
         if (CollectionUtils.isEmpty(weightedDetailsList)) {
+            Double newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
             weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
+            weightedDetails.setCostAfter(newCost);
         } else {
+            Double newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
             weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
+            weightedDetails.setCostAfter(newCost);
         }
+        // 计算新加权成本
+
+
+
         weightedDetailsService.insert(weightedDetails);
         // 修改成本信息表
         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())