|
@@ -787,7 +787,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
contractManagementInfo.setInOutType("销售出库");
|
|
|
//期货取点价,现货取单价
|
|
|
- contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice()!=null?contractManagementInfo.getPointPrice():Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+ if (contractManagementInfo.getUnitContractPrice()!=null) {
|
|
|
+ contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+ }
|
|
|
temp.add(contractManagementInfo);
|
|
|
}
|
|
|
List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
@@ -834,7 +836,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
contractManagementInfo.setInOutType("采购入库");
|
|
|
//期货取点价,现货取单价
|
|
|
- contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice()!=null?contractManagementInfo.getPointPrice():Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+ contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
temp.add(contractManagementInfo);
|
|
|
}
|
|
|
List<InOutWarehouseTask> inOutWarehouseTaskList = iInOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
|
|
@@ -928,7 +930,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
contractManagementInfo.setInOutType("采购入库");
|
|
|
//期货取点价,现货取单价
|
|
|
- contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice()!=null?contractManagementInfo.getPointPrice():Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+ contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
temp.add(contractManagementInfo);
|
|
|
}
|
|
|
List<ContractManagementInfo> contractManagementInfoList1 = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|