|
@@ -71,6 +71,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
private ITranTaskInfoService tranTaskInfoService;
|
|
private ITranTaskInfoService tranTaskInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private ITranProcessInfoService tranProcessInfoService;
|
|
private ITranProcessInfoService tranProcessInfoService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICostManagementInfoService costManagementInfoService;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 仓库管理页面列表
|
|
* 仓库管理页面列表
|
|
@@ -815,7 +817,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
//只有一个汽运的运输阶段
|
|
//只有一个汽运的运输阶段
|
|
if (tranProcessInfoList.size()==1&&tranProcessInfoList.get(0).getTranTypeKey()=="1"){
|
|
if (tranProcessInfoList.size()==1&&tranProcessInfoList.get(0).getTranTypeKey()=="1"){
|
|
//成本为所选车辆出库时所在库的加权成本
|
|
//成本为所选车辆出库时所在库的加权成本
|
|
-
|
|
|
|
|
|
+ WarehouseBaseInfo warehouseBaseInfo=warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
|
|
|
|
+ .eq("comp_id", inOutWarehouseTask.getCompId())
|
|
|
|
+ .eq("warehouse_name", inOutWarehouseTask.getWarehouseName()));
|
|
|
|
+ if (warehouseBaseInfo!=null){
|
|
|
|
+ CostManagementInfo costManagementInfo=costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>()
|
|
|
|
+ .eq("warehouse_id", warehouseBaseInfo.getId()));
|
|
|
|
+ if (costManagementInfo!=null){
|
|
|
|
+ contractManagementInfo.setUnitContractPrice(Double.valueOf(String.valueOf(costManagementInfo.getCost())));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
contractManagementInfo.setUnitContractPrice(null);
|
|
contractManagementInfo.setUnitContractPrice(null);
|