diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java index 04c8e19..8a83e6e 100644 --- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java +++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java @@ -183,6 +183,8 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService { taskHeader.setFromPort(receiptContainerHeader.getPort()); taskHeader.setCreatedBy(QuantityConstant.PLATFORM_MES); taskHeader.setLastUpdatedBy(QuantityConstant.PLATFORM_MES); + // TODO 临时入库策略 +// taskHeaderService.appointLocation(taskHeader); if (!taskHeaderService.save(taskHeader)) { throw new ServiceException("任务生成失败,保存任务头表失败"); } diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java index e1e6b86..d3f0c7f 100644 --- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java +++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java @@ -125,4 +125,10 @@ public interface TaskHeaderService extends IService<TaskHeader> { * @param materialDataList 物料信息 */ void assemble(Integer taskHeaderId, /*String vehicleCode,*/ List<MaterialData> materialDataList); + + /** + * TODO 临时策略:载具从哪个库出来的就回哪个库 + * @param taskHeader 入库任务 + */ + void appointLocation(TaskHeader taskHeader); } diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java index d6eabe4..93a4732 100644 --- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java +++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java @@ -998,6 +998,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea } } + @Override + public void appointLocation(TaskHeader taskHeader) { + LambdaQueryWrapper<TaskHeader> queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.and(x -> + x.eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT) + .or() + .eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_EMPTYSHIPMENT)) + .orderByDesc(TaskHeader::getCreated) + .last("limit 1"); + TaskHeader queryTaskHeader = super.getOne(queryWrapper); + if (queryTaskHeader != null) { + taskHeader.setToLocation(queryTaskHeader.getFromLocation()); + } + } + /** * 移动端创建入库任务 * diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java index efad846..13abcfc 100644 --- a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java +++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java @@ -198,6 +198,8 @@ public class WorkTaskServiceImpl implements WorkTaskService { taskHeader.setVehicleCode(vehicleCode); taskHeader.setVehicleType(vehicle.getVehicleType()); } + // TODO 临时入库策略 +// taskHeaderService.appointLocation(taskHeader); // 设置任务为未回传状态 taskHeader.setIsBack(QuantityConstant.MES_TASK_NOT_BACK); if (!taskHeaderService.save(taskHeader)) {