fix(wms): 删除发货计划时增加业务校验
- 增加对关联收货计划明细的检查逻辑 - 当存在actionType为401的操作记录时阻止删除 - 抛出ServiceException提示用户无法删除的原因 - 使用WmsCoilPendingActionMapper查询待操作记录数量 - 校验条件包括warehouseId匹配且delFlag为0 - 循环检查所有待删除的计划ID
This commit is contained in:
@@ -8,20 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.klp.common.exception.ServiceException;
|
||||||
import com.klp.common.utils.StringUtils;
|
import com.klp.common.utils.StringUtils;
|
||||||
import com.klp.domain.WmsMaterialCoil;
|
import com.klp.domain.*;
|
||||||
import com.klp.domain.WmsDeliveryWaybill;
|
|
||||||
import com.klp.domain.WmsDeliveryWaybillDetail;
|
|
||||||
import com.klp.domain.vo.*;
|
import com.klp.domain.vo.*;
|
||||||
import com.klp.mapper.WmsMaterialCoilMapper;
|
import com.klp.mapper.*;
|
||||||
import com.klp.mapper.WmsDeliveryWaybillMapper;
|
|
||||||
import com.klp.mapper.WmsDeliveryWaybillDetailMapper;
|
|
||||||
import com.klp.system.service.ISysUserService;
|
import com.klp.system.service.ISysUserService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.klp.domain.bo.WmsDeliveryPlanBo;
|
import com.klp.domain.bo.WmsDeliveryPlanBo;
|
||||||
import com.klp.domain.WmsDeliveryPlan;
|
|
||||||
import com.klp.mapper.WmsDeliveryPlanMapper;
|
|
||||||
import com.klp.service.IWmsDeliveryPlanService;
|
import com.klp.service.IWmsDeliveryPlanService;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -47,6 +42,8 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
|
|||||||
|
|
||||||
private final WmsDeliveryWaybillDetailMapper waybillDetailMapper;
|
private final WmsDeliveryWaybillDetailMapper waybillDetailMapper;
|
||||||
|
|
||||||
|
private final WmsCoilPendingActionMapper coilPendingActionMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询发货计划
|
* 查询发货计划
|
||||||
*/
|
*/
|
||||||
@@ -141,7 +138,20 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
|
|||||||
@Override
|
@Override
|
||||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||||
if(isValid){
|
if(isValid){
|
||||||
//TODO 做一些业务上的校验,判断是否需要校验
|
// 检查是否有关联的收货计划明细(actionType为401的操作记录)
|
||||||
|
for (Long planId : ids) {
|
||||||
|
// 查询与该计划关联的待操作记录数量
|
||||||
|
long count = coilPendingActionMapper.selectCount(
|
||||||
|
Wrappers.<WmsCoilPendingAction>lambdaQuery()
|
||||||
|
.eq(WmsCoilPendingAction::getActionType, 401)
|
||||||
|
.eq(WmsCoilPendingAction::getWarehouseId, planId)
|
||||||
|
.eq(WmsCoilPendingAction::getDelFlag, 0)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (count > 0) {
|
||||||
|
throw new ServiceException("发货计划下存在收货计划明细,无法删除");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return baseMapper.deleteBatchIds(ids) > 0;
|
return baseMapper.deleteBatchIds(ids) > 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user