1

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

@@ -380,16 +380,16 @@ 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)) {
-            weightedDetails.setCostBefore(0f);
-        } else {
-            weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
-        }
+       
         // 计算新加权成本
         Double newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Double.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
 
         weightedDetails.setCostAfter(newCost);
-
+        if (CollectionUtils.isEmpty(weightedDetailsList)) {
+            weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
+        } else {
+            weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
+        }
         weightedDetailsService.insert(weightedDetails);
         // 修改成本信息表
         CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())

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

@@ -986,11 +986,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     // 查询入库全加权成本
                     List<WeightedDetails> weightedDetailsList = weightedDetailsService.selectList(new EntityWrapper<WeightedDetails>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
                             .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()).orderBy("update_date", false));
-                    if (CollectionUtils.isEmpty(weightedDetailsList)) {
-                        weightedDetails.setCostBefore(0f);
-                    } else {
-                        weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
-                    }
+
                     // 计算新加权成本
                     Double newCost = 0d;
                     if ("干粮".equals(warehouseInOutInfo.getType())) {
@@ -1001,7 +997,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
                     }
                     weightedDetails.setCostAfter(newCost);
-
+                    if (CollectionUtils.isEmpty(weightedDetailsList)) {
+                        weightedDetails.setCostBefore(Float.valueOf(String.valueOf(newCost)));
+                    } else {
+                        weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
+                    }
                     weightedDetailsService.insert(weightedDetails);
                     // 修改成本信息表
                     CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", weightedDetails.getWarehouseId())