|
@@ -1078,7 +1078,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
|
|
|
stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
|
|
|
stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
|
|
|
- stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
|
|
|
+ if(contractManagementInfo1.getUnitContractPrice()!=null) {
|
|
|
+ stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
|
|
|
+ }
|
|
|
stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
|
|
|
stockSaleReceiptReport.setReturnFlag("1");
|
|
|
stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
|
|
@@ -4422,7 +4424,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
|
|
|
stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
|
|
|
stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
|
|
|
- stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()==null?contractManagementInfo1.getUnitContractPrice():weighingManagement.getContractPrice()))));
|
|
|
+ if(contractManagementInfo1.getUnitContractPrice()!=null) {
|
|
|
+ stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * (Double.valueOf(String.valueOf(weighingManagement.getContractPrice() == null ? contractManagementInfo1.getUnitContractPrice() : weighingManagement.getContractPrice()))));
|
|
|
+ }
|
|
|
stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
|
|
|
stockSaleReceiptReport.setReturnFlag("1");
|
|
|
stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
|