feat(wms): 新增动态关联查询功能并优化钢卷列表接口

- 在 WmsMaterialCoilMapper 中新增 selectVoListWithDynamicJoin 方法
- 修改 selectVoPagePlus SQL 查询逻辑,移除冗余字段
- 实现根据物品类型联查原材料或产品信息
- 更新 WmsMaterialCoilServiceImpl 中 queryList 方法调用新接口
- 优化 WmsMaterialCoilVo 字段注释及 Excel 导出配置- 移除部分不必要的 @ExcelProperty 注解
- 新增 itemName 和 itemCode 字段用于显示物品名称和编号- 调整字段注释说明 dataType 数据类型含义- 修复仓库变更判断逻辑中的空指针风险
This commit is contained in:
2025-10-30 14:59:46 +08:00
parent 824ce738a9
commit ca301a4c18
4 changed files with 54 additions and 37 deletions

View File

@@ -181,10 +181,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
@Override
public List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo) {
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapperPlus(bo);
Page<Object> build = new PageQuery().build();
build.setSize(Long.MAX_VALUE);
Page<WmsMaterialCoilVo> wmsMaterialCoilVoPage = baseMapper.selectVoPagePlus(build, lqw);
return wmsMaterialCoilVoPage.getRecords();
return baseMapper.selectVoListWithDynamicJoin(lqw);
}
/**
@@ -364,9 +361,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
}
// 判断warehouseId是否发生变化
boolean warehouseChanged = bo.getWarehouseId() != null &&
boolean warehouseChanged = bo.getWarehouseId() != null &&
!bo.getWarehouseId().equals(oldCoil.getWarehouseId());
Long qrcodeRecordId;
if (warehouseChanged) {
// 如果库区发生变化,生成新的二维码