1

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

@@ -673,12 +673,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                        (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
+                                        (contractManagementInfo.getUnitContractPrice() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():"")));
                             }
                             //随行就市
                             else {
                                 stockPurchaseReceiptReport.setAmountIngPayable(Double.valueOf(warehouseInOutInfo.getNetWeight() *
-                                        (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()))));
+                                        (warehouseInOutInfo.getCost() - Float.valueOf(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():""))));
                             }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());