1

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

@@ -1203,15 +1203,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                            stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                            stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
                                         (contractManagementInfo.getUnitContractPrice()));
                             }
-                            //随行就市
-                            else {
-                                stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() * warehouseInOutInfo.getCost()));
-                            }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                             stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());