|
@@ -48,6 +48,8 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
|
|
private IContractManagementInfoService contractManagementInfoService;
|
|
private IContractManagementInfoService contractManagementInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private IInOutWarehouseTaskService iInOutWarehouseTaskService;
|
|
private IInOutWarehouseTaskService iInOutWarehouseTaskService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IWarehousePositionInfoService warehousePositionInfoService;
|
|
/**
|
|
/**
|
|
* 创建运输任务
|
|
* 创建运输任务
|
|
* @param tranTaskInfo
|
|
* @param tranTaskInfo
|
|
@@ -269,6 +271,17 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
|
|
.eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
|
|
.eq(WarehouseBaseInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
|
|
.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE,warehouseType)
|
|
.eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_TYPE,warehouseType)
|
|
.orderBy(WarehouseBaseInfo.QueryFiles.UPDATE_DATE, false));
|
|
.orderBy(WarehouseBaseInfo.QueryFiles.UPDATE_DATE, false));
|
|
|
|
+ if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
|
|
|
|
+ for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
|
|
|
|
+ // 以库位为维度查询
|
|
|
|
+ List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
|
|
|
|
+ .eq("base_id", warehouseBaseInfo.getId()));
|
|
|
|
+ if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
|
|
|
|
+ warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
return warehouseBaseInfoList;
|
|
return warehouseBaseInfoList;
|
|
}
|
|
}
|
|
|
|
|