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/WarehouseInOutInfoServiceImpl.java

@@ -881,6 +881,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
+                            stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
+                            CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id",warehouseInOutInfo.getBaseId()));
+                            if(costManagementInfo != null){
+                                stockSaleReceiptReport.setCost(costManagementInfo.getCost());
+
+                            }
                             stockSaleReceiptReportService.insert(stockSaleReceiptReport);
                         }
                         //自运的销售合同
@@ -910,6 +916,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
+                            stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
+                            CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id",warehouseInOutInfo.getBaseId()));
+                            if(costManagementInfo != null){
+                                stockSaleReceiptReport.setCost(costManagementInfo.getCost());
+
+                            }
                             stockSaleReceiptReportService.insert(stockSaleReceiptReport);
                         }
                     }
@@ -1193,6 +1205,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
+                            stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
+                            CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id",warehouseInOutInfo.getBaseId()));
+                            if(costManagementInfo != null){
+                                stockSaleReceiptReport.setCost(costManagementInfo.getCost());
+
+                            }
                             stockSaleReceiptReportService.insert(stockSaleReceiptReport);
                         }
                         //自运的销售合同
@@ -1293,6 +1311,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
+                            stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
+                            CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id",warehouseInOutInfo.getBaseId()));
+                            if(costManagementInfo != null){
+                                stockSaleReceiptReport.setCost(costManagementInfo.getCost());
+
+                            }
                             stockSaleReceiptReportService.insert(stockSaleReceiptReport);
                         }
                     }