Commit 8bd88fae85369a253e90d4e46a0cd03a437c0bad
1 parent
1738cdb6
feat: 临时入库策略:托盘从哪来回哪去
Showing
4 changed files
with
25 additions
and
0 deletions
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java
@@ -183,6 +183,8 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService { | @@ -183,6 +183,8 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService { | ||
183 | taskHeader.setFromPort(receiptContainerHeader.getPort()); | 183 | taskHeader.setFromPort(receiptContainerHeader.getPort()); |
184 | taskHeader.setCreatedBy(QuantityConstant.PLATFORM_MES); | 184 | taskHeader.setCreatedBy(QuantityConstant.PLATFORM_MES); |
185 | taskHeader.setLastUpdatedBy(QuantityConstant.PLATFORM_MES); | 185 | taskHeader.setLastUpdatedBy(QuantityConstant.PLATFORM_MES); |
186 | + // TODO 临时入库策略 | ||
187 | +// taskHeaderService.appointLocation(taskHeader); | ||
186 | if (!taskHeaderService.save(taskHeader)) { | 188 | if (!taskHeaderService.save(taskHeader)) { |
187 | throw new ServiceException("任务生成失败,保存任务头表失败"); | 189 | throw new ServiceException("任务生成失败,保存任务头表失败"); |
188 | } | 190 | } |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
@@ -125,4 +125,10 @@ public interface TaskHeaderService extends IService<TaskHeader> { | @@ -125,4 +125,10 @@ public interface TaskHeaderService extends IService<TaskHeader> { | ||
125 | * @param materialDataList 物料信息 | 125 | * @param materialDataList 物料信息 |
126 | */ | 126 | */ |
127 | void assemble(Integer taskHeaderId, /*String vehicleCode,*/ List<MaterialData> materialDataList); | 127 | void assemble(Integer taskHeaderId, /*String vehicleCode,*/ List<MaterialData> materialDataList); |
128 | + | ||
129 | + /** | ||
130 | + * TODO 临时策略:载具从哪个库出来的就回哪个库 | ||
131 | + * @param taskHeader 入库任务 | ||
132 | + */ | ||
133 | + void appointLocation(TaskHeader taskHeader); | ||
128 | } | 134 | } |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -998,6 +998,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | @@ -998,6 +998,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea | ||
998 | } | 998 | } |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | + @Override | ||
1002 | + public void appointLocation(TaskHeader taskHeader) { | ||
1003 | + LambdaQueryWrapper<TaskHeader> queryWrapper = Wrappers.lambdaQuery(); | ||
1004 | + queryWrapper.and(x -> | ||
1005 | + x.eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT) | ||
1006 | + .or() | ||
1007 | + .eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_EMPTYSHIPMENT)) | ||
1008 | + .orderByDesc(TaskHeader::getCreated) | ||
1009 | + .last("limit 1"); | ||
1010 | + TaskHeader queryTaskHeader = super.getOne(queryWrapper); | ||
1011 | + if (queryTaskHeader != null) { | ||
1012 | + taskHeader.setToLocation(queryTaskHeader.getFromLocation()); | ||
1013 | + } | ||
1014 | + } | ||
1015 | + | ||
1001 | /** | 1016 | /** |
1002 | * 移动端创建入库任务 | 1017 | * 移动端创建入库任务 |
1003 | * | 1018 | * |
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java
@@ -198,6 +198,8 @@ public class WorkTaskServiceImpl implements WorkTaskService { | @@ -198,6 +198,8 @@ public class WorkTaskServiceImpl implements WorkTaskService { | ||
198 | taskHeader.setVehicleCode(vehicleCode); | 198 | taskHeader.setVehicleCode(vehicleCode); |
199 | taskHeader.setVehicleType(vehicle.getVehicleType()); | 199 | taskHeader.setVehicleType(vehicle.getVehicleType()); |
200 | } | 200 | } |
201 | + // TODO 临时入库策略 | ||
202 | +// taskHeaderService.appointLocation(taskHeader); | ||
201 | // 设置任务为未回传状态 | 203 | // 设置任务为未回传状态 |
202 | taskHeader.setIsBack(QuantityConstant.MES_TASK_NOT_BACK); | 204 | taskHeader.setIsBack(QuantityConstant.MES_TASK_NOT_BACK); |
203 | if (!taskHeaderService.save(taskHeader)) { | 205 | if (!taskHeaderService.save(taskHeader)) { |