DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 新增发货计划钢卷操作记录和明细管理模块

Browse Source 
- 新增发货计划钢卷操作记录实体类、业务对象及视图对象
- 新增发货计划明细实体类、业务对象及视图对象
- 实现发货计划钢卷操作记录的增删改查接口及导出功能
- 实现发货计划明细的增删改查接口及导出功能
- 新增钢卷操作记录查询接口，支持根据计划ID和钢卷ID列表获取最新操作记录
- 完成对应Mapper接口和XML映射文件的配置
- 集成基础校验和逻辑删除功能
- 提供钢卷操作记录与钢卷明细信息的联合查询能力
This commit is contained in:
Joshi
2025-12-17 13:58:04 +08:00
parent faac750ff6
commit b02fb8025a
16 changed files with 1029 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanCoilOperateService.java Normal file
View File

@@ -0,0 +1,52 @@
package com.klp.service;
import com.klp.domain.WmsDeliveryPlanCoilOperate;
import com.klp.domain.vo.WmsDeliveryPlanCoilOperateVo;
import com.klp.domain.bo.WmsDeliveryPlanCoilOperateBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import javax.validation.constraints.NotNull;
import java.util.Collection;
import java.util.List;
/**
* 发货计划钢卷操作记录Service接口
*
* @author klp
* @date 2025-12-17
*/
public interface IWmsDeliveryPlanCoilOperateService {
/**
* 查询发货计划钢卷操作记录
*/
WmsDeliveryPlanCoilOperateVo queryById(Long operateId);
/**
* 查询发货计划钢卷操作记录列表
*/
TableDataInfo<WmsDeliveryPlanCoilOperateVo> queryPageList(WmsDeliveryPlanCoilOperateBo bo, PageQuery pageQuery);
/**
* 查询发货计划钢卷操作记录列表
*/
List<WmsDeliveryPlanCoilOperateVo> queryList(WmsDeliveryPlanCoilOperateBo bo);
/**
* 新增发货计划钢卷操作记录
*/
Boolean insertByBo(WmsDeliveryPlanCoilOperateBo bo);
/**
* 修改发货计划钢卷操作记录
*/
Boolean updateByBo(WmsDeliveryPlanCoilOperateBo bo);
/**
* 校验并批量删除发货计划钢卷操作记录信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<WmsDeliveryPlanCoilOperateVo> getCoilOperate(Long planId, String coilIds);
}

49
klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanDetailService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.service;
import com.klp.domain.WmsDeliveryPlanDetail;
import com.klp.domain.vo.WmsDeliveryPlanDetailVo;
import com.klp.domain.bo.WmsDeliveryPlanDetailBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 发货计划明细Service接口
*
* @author klp
* @date 2025-12-17
*/
public interface IWmsDeliveryPlanDetailService {
/**
* 查询发货计划明细
*/
WmsDeliveryPlanDetailVo queryById(Long detailId);
/**
* 查询发货计划明细列表
*/
TableDataInfo<WmsDeliveryPlanDetailVo> queryPageList(WmsDeliveryPlanDetailBo bo, PageQuery pageQuery);
/**
* 查询发货计划明细列表
*/
List<WmsDeliveryPlanDetailVo> queryList(WmsDeliveryPlanDetailBo bo);
/**
* 新增发货计划明细
*/
Boolean insertByBo(WmsDeliveryPlanDetailBo bo);
/**
* 修改发货计划明细
*/
Boolean updateByBo(WmsDeliveryPlanDetailBo bo);
/**
* 校验并批量删除发货计划明细信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

148
klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanCoilOperateServiceImpl.java Normal file
View File

@@ -0,0 +1,148 @@
package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsDeliveryPlanCoilOperateBo;
import com.klp.domain.vo.WmsDeliveryPlanCoilOperateVo;
import com.klp.domain.WmsDeliveryPlanCoilOperate;
import com.klp.mapper.WmsDeliveryPlanCoilOperateMapper;
import com.klp.service.IWmsDeliveryPlanCoilOperateService;
import java.util.*;
import java.util.stream.Collectors;
/**
* 发货计划钢卷操作记录Service业务层处理
*
* @author klp
* @date 2025-12-17
*/
@RequiredArgsConstructor
@Service
public class WmsDeliveryPlanCoilOperateServiceImpl implements IWmsDeliveryPlanCoilOperateService {
private final WmsDeliveryPlanCoilOperateMapper baseMapper;
private WmsMaterialCoilServiceImpl materialCoilService;
/**
* 查询发货计划钢卷操作记录
*/
@Override
public WmsDeliveryPlanCoilOperateVo queryById(Long operateId){
return baseMapper.selectVoById(operateId);
}
/**
* 查询发货计划钢卷操作记录列表
*/
@Override
public TableDataInfo<WmsDeliveryPlanCoilOperateVo> queryPageList(WmsDeliveryPlanCoilOperateBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsDeliveryPlanCoilOperate> lqw = buildQueryWrapper(bo);
Page<WmsDeliveryPlanCoilOperateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询发货计划钢卷操作记录列表
*/
@Override
public List<WmsDeliveryPlanCoilOperateVo> queryList(WmsDeliveryPlanCoilOperateBo bo) {
LambdaQueryWrapper<WmsDeliveryPlanCoilOperate> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsDeliveryPlanCoilOperate> buildQueryWrapper(WmsDeliveryPlanCoilOperateBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsDeliveryPlanCoilOperate> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getPlanId() != null, WmsDeliveryPlanCoilOperate::getPlanId, bo.getPlanId());
lqw.eq(bo.getCoilId() != null, WmsDeliveryPlanCoilOperate::getCoilId, bo.getCoilId());
lqw.eq(StringUtils.isNotBlank(bo.getOperateType()), WmsDeliveryPlanCoilOperate::getOperateType, bo.getOperateType());
return lqw;
}
/**
* 新增发货计划钢卷操作记录
*/
@Override
public Boolean insertByBo(WmsDeliveryPlanCoilOperateBo bo) {
WmsDeliveryPlanCoilOperate add = BeanUtil.toBean(bo, WmsDeliveryPlanCoilOperate.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setOperateId(add.getOperateId());
}
return flag;
}
/**
* 修改发货计划钢卷操作记录
*/
@Override
public Boolean updateByBo(WmsDeliveryPlanCoilOperateBo bo) {
WmsDeliveryPlanCoilOperate update = BeanUtil.toBean(bo, WmsDeliveryPlanCoilOperate.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsDeliveryPlanCoilOperate entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除发货计划钢卷操作记录
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<WmsDeliveryPlanCoilOperateVo> getCoilOperate(Long planId, String coilIds) {
// 边界校验：空值/空字符串直接返回空列表
if (planId == null || coilIds == null || coilIds.trim().isEmpty()) {
return Collections.emptyList();
}
String[] coilIdArray = coilIds.split(",");
// 过滤空字符串（避免split出""的情况，比如coilIds是",1002,"）
coilIdArray = Arrays.stream(coilIdArray)
.filter(StringUtils::isNotBlank)
.toArray(String[]::new);
if (coilIdArray.length == 0) {
return Collections.emptyList();
}
List<WmsDeliveryPlanCoilOperateVo> coilOperate = baseMapper.getCoilOperate(planId, coilIdArray);
//接着就是根据钢卷ids去查询钢卷list了 用分页查询的list就需要设置分页参数都设置为最大即可
WmsMaterialCoilBo bo = new WmsMaterialCoilBo();
bo.setCoilIds(coilIds);
PageQuery pageQuery = new PageQuery();
pageQuery.setPageNum(1);
pageQuery.setPageSize(Integer.MAX_VALUE);
TableDataInfo<WmsMaterialCoilVo> tableDataInfo = materialCoilService.queryPageList(bo, pageQuery);
List<WmsMaterialCoilVo> coilDetails = tableDataInfo.getRows();
// 将钢卷详细信息设置到操作记录中
Map<Long, WmsMaterialCoilVo> coilDetailMap = coilDetails.stream()
.collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, coil -> coil));
for (WmsDeliveryPlanCoilOperateVo operate : coilOperate) {
operate.setCoilDetail(coilDetailMap.get(operate.getCoilId()));
}
return coilOperate;
}
}

114
klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanDetailServiceImpl.java Normal file
View File

@@ -0,0 +1,114 @@
package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsDeliveryPlanDetailBo;
import com.klp.domain.vo.WmsDeliveryPlanDetailVo;
import com.klp.domain.WmsDeliveryPlanDetail;
import com.klp.mapper.WmsDeliveryPlanDetailMapper;
import com.klp.service.IWmsDeliveryPlanDetailService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 发货计划明细Service业务层处理
*
* @author klp
* @date 2025-12-17
*/
@RequiredArgsConstructor
@Service
public class WmsDeliveryPlanDetailServiceImpl implements IWmsDeliveryPlanDetailService {
private final WmsDeliveryPlanDetailMapper baseMapper;
/**
* 查询发货计划明细
*/
@Override
public WmsDeliveryPlanDetailVo queryById(Long detailId){
return baseMapper.selectVoById(detailId);
}
/**
* 查询发货计划明细列表
*/
@Override
public TableDataInfo<WmsDeliveryPlanDetailVo> queryPageList(WmsDeliveryPlanDetailBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsDeliveryPlanDetail> lqw = buildQueryWrapper(bo);
Page<WmsDeliveryPlanDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询发货计划明细列表
*/
@Override
public List<WmsDeliveryPlanDetailVo> queryList(WmsDeliveryPlanDetailBo bo) {
LambdaQueryWrapper<WmsDeliveryPlanDetail> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsDeliveryPlanDetail> buildQueryWrapper(WmsDeliveryPlanDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsDeliveryPlanDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getPlanId() != null, WmsDeliveryPlanDetail::getPlanId, bo.getPlanId());
lqw.eq(bo.getOrderId() != null, WmsDeliveryPlanDetail::getOrderId, bo.getOrderId());
lqw.eq(StringUtils.isNotBlank(bo.getOrderDetail()), WmsDeliveryPlanDetail::getOrderDetail, bo.getOrderDetail());
lqw.eq(bo.getCustomerId() != null, WmsDeliveryPlanDetail::getCustomerId, bo.getCustomerId());
lqw.eq(StringUtils.isNotBlank(bo.getCustomerDetail()), WmsDeliveryPlanDetail::getCustomerDetail, bo.getCustomerDetail());
lqw.eq(StringUtils.isNotBlank(bo.getAddress()), WmsDeliveryPlanDetail::getAddress, bo.getAddress());
return lqw;
}
/**
* 新增发货计划明细
*/
@Override
public Boolean insertByBo(WmsDeliveryPlanDetailBo bo) {
WmsDeliveryPlanDetail add = BeanUtil.toBean(bo, WmsDeliveryPlanDetail.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setDetailId(add.getDetailId());
}
return flag;
}
/**
* 修改发货计划明细
*/
@Override
public Boolean updateByBo(WmsDeliveryPlanDetailBo bo) {
WmsDeliveryPlanDetail update = BeanUtil.toBean(bo, WmsDeliveryPlanDetail.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsDeliveryPlanDetail entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除发货计划明细
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}