1

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

@@ -2573,6 +2573,20 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                 Double afterCost = 0d;
                 String goodsName = warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", "");
                 for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
+                    if ("采购入库".equals(warehousingOrder1.getInType())){
+                        List<WarehouseInOutInfo> warehouseInOutInfoList=warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                                .eq("order_id",warehousingOrder1.getId()));
+                        if (!CollectionUtils.isEmpty(warehouseInOutInfoList)){
+                            warehousingOrder1.setAfterWeight((warehouseInOutInfoList.stream().mapToDouble(WarehouseInOutInfo::getPureWeight).sum()));
+                        }
+                    }
+                    else if ("收购入库".equals(warehousingOrder1.getInType())){
+                        List<PaymentManagement> paymentManagementList=paymentManagementService.selectList(new EntityWrapper<PaymentManagement>()
+                                .eq("order_id",warehousingOrder1.getId()));
+                        if (!CollectionUtils.isEmpty(paymentManagementList)){
+                            warehousingOrder1.setAfterWeight(((paymentManagementList.stream().mapToDouble(PaymentManagement::getPureWeight).sum())/ 1000));
+                        }
+                    }
                     afterCost = warehousingOrder1.getSurplusWeight() * warehousingOrder1.getAvgCost() / warehousingOrder1.getAfterWeight();
                     warehousingOrder1.setSurplusWeight(0d);
                     warehousingOrder1.setOutWarehouseWeight(warehousingOrder1.getInWarehouseWeight());