|
|
|
|
@ -166,7 +166,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 8. 重量校验(小于50kg才允许绑定,避免超重)
|
|
|
|
|
if (task.getWeight().compareTo(BigDecimal.valueOf(50)) < 0) { |
|
|
|
|
if (task.getWeight().compareTo(BigDecimal.valueOf(50)) > 0) { |
|
|
|
|
return R.fail("箱条码绑定的订单重量过重,请重新进行绑定"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -202,7 +202,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
|
|
|
|
|
// 2. 查询该箱条码对应的运行中任务
|
|
|
|
|
List<Task> taskList = iTaskService.list( |
|
|
|
|
new LambdaQueryWrapper<Task>().eq(Task::getBoxBarcode, boxBarcode).in(Task::getTaskStatus,RUNNING_STATUSES) |
|
|
|
|
new LambdaQueryWrapper<Task>().eq(Task::getBoxBarcode, boxBarcode).in(false,Task::getTaskStatus,RUNNING_STATUSES) |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
// 3. 遍历任务,重置站点/库位状态 + 解绑订单 + 结束任务
|
|
|
|
|
@ -230,9 +230,9 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 3.4 结束任务(更新任务状态为已完成)
|
|
|
|
|
task.setTaskStatus(STATUS_FINISHED); |
|
|
|
|
iTaskService.updateById(task); |
|
|
|
|
// // 3.4 结束任务(更新任务状态为已完成)
|
|
|
|
|
// task.setTaskStatus(STATUS_FINISHED);
|
|
|
|
|
// iTaskService.updateById(task);
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return R.success(); |
|
|
|
|
|