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

feat(wms/move): 新增调拨记录的入场卷号和当前卷号筛选功能

Browse Source 
1. 前端在移库操作和记录页面新增入场卷号和当前卷号查询字段，并添加清空按钮
2. 后端在WmsTransferOrderItemBo中新增enterCoilNo和currentCoilNo字段
3. 在WmsTransferOrderItemServiceImpl中实现根据入场/当前钢卷号查询钢卷ID并过滤移库记录的逻辑
4. 优化查询条件处理，当无匹配钢卷时返回空结果集
This commit is contained in:
Joshi
2026-05-28 10:56:57 +08:00
parent 6de1bbfe0b
commit e4f1c8d2b1
4 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java
View File

@@ -84,4 +84,10 @@ public class WmsTransferOrderItemBo extends BaseEntity {
// 重贴标签的备注
private String transferRemark;
/** 入场钢卷号 */
private String enterCoilNo;
/** 当前钢卷号 */
private String currentCoilNo;
}

14
klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java
View File

@@ -330,6 +330,20 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer
lqw.eq(bo.getWarehouseIdBefore() != null, WmsTransferOrderItem::getWarehouseIdBefore, bo.getWarehouseIdBefore());
lqw.eq(bo.getWarehouseIdAfter() != null, WmsTransferOrderItem::getWarehouseIdAfter, bo.getWarehouseIdAfter());
lqw.eq(bo.getIsTransferred() != null, WmsTransferOrderItem::getIsTransferred, bo.getIsTransferred());
// 根据入场钢卷号/当前钢卷号查询钢卷ID作为过滤条件
if (StringUtils.isNotBlank(bo.getEnterCoilNo()) || StringUtils.isNotBlank(bo.getCurrentCoilNo())) {
LambdaQueryWrapper<WmsMaterialCoil> coilQuery = Wrappers.lambdaQuery();
coilQuery.eq(StringUtils.isNotBlank(bo.getEnterCoilNo()), WmsMaterialCoil::getEnterCoilNo, bo.getEnterCoilNo());
coilQuery.eq(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsMaterialCoil::getCurrentCoilNo, bo.getCurrentCoilNo());
List<Long> matchedCoilIds = coilMapper.selectList(coilQuery).stream()
.map(WmsMaterialCoil::getCoilId)
.collect(Collectors.toList());
if (matchedCoilIds.isEmpty()) {
lqw.eq(WmsTransferOrderItem::getOrderItemId, -1L);
} else {
lqw.in(WmsTransferOrderItem::getCoilId, matchedCoilIds);
}
}
return lqw;
}