更新

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

@@ -771,7 +771,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //随行就市
                             else {
                                 BigDecimal cost = new BigDecimal(Float.toString(warehouseInOutInfo.getCost()));
-                                BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
+                                BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():0.0);
                                 stockPurchaseReceiptReport.setSettlementPrice(cost.subtract(deductionAmount).doubleValue());
                                 BigDecimal netWeight = new BigDecimal(warehouseInOutInfo.getNetWeight());
                                 stockPurchaseReceiptReport.setAmountIngPayable(cost.subtract(deductionAmount).multiply(netWeight).doubleValue());
@@ -848,7 +848,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     if(contractManagementInfo.getUnitContractPrice()!=null) {
                                         BigDecimal cost = new BigDecimal(contractManagementInfo.getUnitContractPrice());
-                                        BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
+                                        BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():0.0);
                                         stockPurchaseReceiptReport.setSettlementPrice(cost.subtract(deductionAmount).doubleValue());
                                         BigDecimal netWeight = new BigDecimal(warehouseInOutInfo.getNetWeight());
                                         stockPurchaseReceiptReport.setAmountIngPayable(cost.subtract(deductionAmount).multiply(netWeight).doubleValue());
@@ -856,7 +856,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     //随行就市
                                     else {
                                         BigDecimal cost = new BigDecimal(warehouseInOutInfo.getCost());
-                                        BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
+                                        BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount()!=null?warehouseInOutInfo.getDeductionAmount():0.0);
                                         stockPurchaseReceiptReport.setSettlementPrice(cost.subtract(deductionAmount).doubleValue());
                                         BigDecimal netWeight = new BigDecimal(warehouseInOutInfo.getNetWeight());
                                         stockPurchaseReceiptReport.setAmountIngPayable(cost.subtract(deductionAmount).multiply(netWeight).doubleValue());