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

refactor(wms): 将仓库操作日志服务中的仓库实体替换为实际仓库实体

Browse Source 
- 替换 WmsWarehouse 为 WmsActualWarehouse 相关类
- 更新 WmsActualWarehouseMapper 的依赖注入
- 修改查询条件中仓库ID字段的映射关系
- 调整子仓库ID获取逻辑以适配新的实体结构
- 更新VO类中仓库属性的数据类型定义
This commit is contained in:
Joshi
2026-03-05 15:38:50 +08:00
parent f30fd06dc4
commit e8b40d2fa3
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-wms/src/main/java/com/klp/domain/vo/WmsCoilWarehouseOperationLogVo.java
View File

@@ -61,7 +61,7 @@ public class WmsCoilWarehouseOperationLogVo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
private WmsWarehouseVo warehouse; private WmsActualWarehouseVo warehouse;
private WmsMaterialCoilVo coil; private WmsMaterialCoilVo coil;

39
klp-wms/src/main/java/com/klp/service/impl/WmsCoilWarehouseOperationLogServiceImpl.java
View File

@@ -7,20 +7,19 @@ import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.domain.WmsActualWarehouse;
import com.klp.domain.WmsMaterialCoil; import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsActualWarehouseVo;
import com.klp.mapper.WmsActualWarehouseMapper;
import com.klp.service.IWmsMaterialCoilService; import com.klp.service.IWmsMaterialCoilService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo; import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo;
import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo; import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo;
import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.WmsWarehouseVo;
import com.klp.domain.WmsCoilWarehouseOperationLog; import com.klp.domain.WmsCoilWarehouseOperationLog;
import com.klp.domain.WmsWarehouse;
import com.klp.mapper.WmsCoilWarehouseOperationLogMapper; import com.klp.mapper.WmsCoilWarehouseOperationLogMapper;
import com.klp.mapper.WmsWarehouseMapper;
import com.klp.mapper.WmsMaterialCoilMapper;
import com.klp.service.IWmsCoilWarehouseOperationLogService; import com.klp.service.IWmsCoilWarehouseOperationLogService;
import java.util.*; import java.util.*;
@@ -37,7 +36,7 @@ import java.util.stream.Collectors;
public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehouseOperationLogService { public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehouseOperationLogService {
private final WmsCoilWarehouseOperationLogMapper baseMapper; private final WmsCoilWarehouseOperationLogMapper baseMapper;
private final WmsWarehouseMapper wmsWarehouseMapper; private final WmsActualWarehouseMapper wmsActualWarehouseMapper;
private final IWmsMaterialCoilService wmsMaterialCoilService; private final IWmsMaterialCoilService wmsMaterialCoilService;
/** /**
@@ -122,9 +121,9 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
@Override @Override
public boolean deleteByCoilIdAndTypes(Long coilId, String operationType, String inOutType) { public boolean deleteByCoilIdAndTypes(Long coilId, String operationType, String inOutType) {
LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
lqw.eq(coilId != null, WmsCoilWarehouseOperationLog::getCoilId, coilId); lqw.eq(WmsCoilWarehouseOperationLog::getCoilId, coilId);
lqw.eq(operationType != null, WmsCoilWarehouseOperationLog::getOperationType, operationType); lqw.eq(WmsCoilWarehouseOperationLog::getOperationType, operationType);
lqw.eq(inOutType != null, WmsCoilWarehouseOperationLog::getInOutType, inOutType); lqw.eq(WmsCoilWarehouseOperationLog::getInOutType, inOutType);
return baseMapper.delete(lqw) > 0; return baseMapper.delete(lqw) > 0;
} }
@@ -162,14 +161,14 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
} }
Map<Long, WmsWarehouseVo> warehouseMap = new HashMap<>(); Map<Long, WmsActualWarehouseVo> warehouseMap = new HashMap<>();
if (!warehouseIds.isEmpty()) { if (!warehouseIds.isEmpty()) {
LambdaQueryWrapper<WmsWarehouse> warehouseQuery = Wrappers.lambdaQuery(); LambdaQueryWrapper<WmsActualWarehouse> warehouseQuery = Wrappers.lambdaQuery();
warehouseQuery.in(WmsWarehouse::getWarehouseId, warehouseIds); warehouseQuery.in(WmsActualWarehouse::getActualWarehouseId, warehouseIds);
List<WmsWarehouse> warehouses = wmsWarehouseMapper.selectList(warehouseQuery); List<WmsActualWarehouse> warehouses = wmsActualWarehouseMapper.selectList(warehouseQuery);
for (WmsWarehouse warehouse : warehouses) { for (WmsActualWarehouse warehouse : warehouses) {
WmsWarehouseVo vo = BeanUtil.toBean(warehouse, WmsWarehouseVo.class); WmsActualWarehouseVo vo = BeanUtil.toBean(warehouse, WmsActualWarehouseVo.class);
warehouseMap.put(warehouse.getWarehouseId(), vo); warehouseMap.put(warehouse.getActualWarehouseId(), vo);
} }
} }
@@ -184,11 +183,11 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
private Set<Long> getAllChildWarehouseIds(Long parentId) { private Set<Long> getAllChildWarehouseIds(Long parentId) {
Set<Long> result = new HashSet<>(); Set<Long> result = new HashSet<>();
result.add(parentId); result.add(parentId);
LambdaQueryWrapper<WmsWarehouse> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<WmsActualWarehouse> lqw = Wrappers.lambdaQuery();
lqw.eq(WmsWarehouse::getParentId, parentId); lqw.eq(WmsActualWarehouse::getParentId, parentId);
List<WmsWarehouse> children = wmsWarehouseMapper.selectList(lqw); List<WmsActualWarehouse> children = wmsActualWarehouseMapper.selectList(lqw);
for (WmsWarehouse child : children) { for (WmsActualWarehouse child : children) {
result.addAll(getAllChildWarehouseIds(child.getWarehouseId())); result.addAll(getAllChildWarehouseIds(child.getActualWarehouseId()));
} }
return result; return result;
} }