refactor(wms): 优化调拨任务重新打印和删除逻辑

- 移除重新打印和删除操作中的 inboundStatus 验证
- 新增出库数量和调拨数量比较逻辑,只有相等时才允许操作
-简化 updateTaskBarcode 方法,移除不必要的状态检查
- 优化 deleteTasksByDetailId 方法,增加删除条件验证
master
zangch@mesnac.com 3 months ago
parent c39c0b7016
commit c071b23c98

@ -199,13 +199,12 @@ public class WmsAllocateTaskServiceImpl implements IWmsAllocateTaskService {
// Web端覆盖模式如果已有打印记录先删除再新增 // Web端覆盖模式如果已有打印记录先删除再新增
List<WmsAllocateTaskVo> existingTasks = queryTasksByDetailId(aoDId); List<WmsAllocateTaskVo> existingTasks = queryTasksByDetailId(aoDId);
if (!existingTasks.isEmpty()) { if (!existingTasks.isEmpty()) {
// 检查是否有已开始执行的任务 // 新业务规则:只有出库数量等于调拨数量时才允许重新打印
for (WmsAllocateTaskVo task : existingTasks) { BigDecimal outSum = BigDecimal.valueOf(detailVo.getOutSum());
if ("1".equals(task.getInboundStatus()) || "2".equals(task.getInboundStatus())) { if (outSum.compareTo(detailVo.getAllocateOrderQty()) != 0) {
throw new ServiceException("存在已开始执行的任务,不允许覆盖"); throw new ServiceException("只有出库数量等于调拨数量时才能重新打印,当前出库数量:" + outSum + ",调拨数量:" + detailVo.getAllocateOrderQty());
} }
} // 删除现有任务移除inboundStatus验证
// 删除现有任务
deleteTasksByDetailId(aoDId); deleteTasksByDetailId(aoDId);
} }
@ -381,22 +380,21 @@ public class WmsAllocateTaskServiceImpl implements IWmsAllocateTaskService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateTaskBarcode(Long allocateTaskId, String batchCode, BigDecimal materialQty) { public Boolean updateTaskBarcode(Long allocateTaskId, String batchCode, BigDecimal materialQty) {
WmsAllocateTask task = baseMapper.selectById(allocateTaskId); WmsAllocateTask task = baseMapper.selectById(allocateTaskId);
if (task == null) { if (task == null) {
throw new ServiceException("调拨任务不存在"); throw new ServiceException("调拨任务不存在");
} }
// 检查任务状态 // 移除inboundStatus验证允许直接修改条码和分包数量
if ("1".equals(task.getInboundStatus()) || "2".equals(task.getInboundStatus())) {//入库状态(0-待入库,1-已入库,2-入库中) // 只允许修改条码和分包数量,其他字段保持不变
throw new ServiceException("该任务已开始执行,不允许修改"); WmsAllocateTask updateTask = new WmsAllocateTask();
} updateTask.setAllocateTaskId(allocateTaskId);
updateTask.setBatchCode(batchCode);
updateTask.setMaterialQty(materialQty);
// 更新任务信息 return baseMapper.updateById(updateTask) > 0;
task.setBatchCode(batchCode);
task.setMaterialQty(materialQty);
return baseMapper.updateById(task) > 0;
} }
/** /**
@ -408,24 +406,28 @@ public class WmsAllocateTaskServiceImpl implements IWmsAllocateTaskService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean deleteTasksByDetailId(Long aoDId) { public Boolean deleteTasksByDetailId(Long aoDId) {
// 获取调拨明细信息,验证删除条件
org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo detailVo = allocateOrderDetailService.queryById(aoDId);
if (detailVo == null) {
throw new ServiceException("调拨明细不存在");
}
// 验证删除条件:只有出库数量等于调拨数量时才能删除
BigDecimal outSum = BigDecimal.valueOf(detailVo.getOutSum());
if (outSum.compareTo(detailVo.getAllocateOrderQty()) != 0) {
throw new ServiceException("只有出库数量等于调拨数量时才能删除任务,当前出库数量:" + outSum + ",调拨数量:" + detailVo.getAllocateOrderQty());
}
MPJLambdaWrapper<WmsAllocateTask> wrapper = JoinWrappers.lambda(WmsAllocateTask.class) MPJLambdaWrapper<WmsAllocateTask> wrapper = JoinWrappers.lambda(WmsAllocateTask.class)
.eq(WmsAllocateTask::getAoDId, aoDId); .eq(WmsAllocateTask::getAoDId, aoDId);
List<WmsAllocateTask> tasks = baseMapper.selectList(wrapper); List<WmsAllocateTask> tasks = baseMapper.selectList(wrapper);
// 检查是否有已开始执行的任务
for (WmsAllocateTask task : tasks) {
if ("1".equals(task.getInboundStatus()) || "2".equals(task.getInboundStatus())) {//入库状态(0-待入库,1-已入库,2-入库中)
throw new ServiceException("存在已开始执行的任务,不允许删除");
}
}
if (!tasks.isEmpty()) { if (!tasks.isEmpty()) {
List<Long> taskIds = tasks.stream().map(WmsAllocateTask::getAllocateTaskId).toList(); List<Long> taskIds = tasks.stream().map(WmsAllocateTask::getAllocateTaskId).toList();
int deleteCount = baseMapper.deleteByIds(taskIds); int deleteCount = baseMapper.deleteByIds(taskIds);
// 更新调拨明细的已分包数量 // 更新调拨明细的已分包数量
org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo detailVo = allocateOrderDetailService.queryById(aoDId);
if (detailVo != null) { if (detailVo != null) {
org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo detailBo = new org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo(); org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo detailBo = new org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo();
detailBo.setAoDId(detailVo.getAoDId()); detailBo.setAoDId(detailVo.getAoDId());

Loading…
Cancel
Save