diff --git a/klp-ui/src/views/wms/move/do.vue b/klp-ui/src/views/wms/move/do.vue index 55418979..0f4254a9 100644 --- a/klp-ui/src/views/wms/move/do.vue +++ b/klp-ui/src/views/wms/move/do.vue @@ -2,12 +2,12 @@
- + @@ -33,6 +33,7 @@ 查询 批量执行 + 清空 @@ -98,6 +99,8 @@ export default { refreshLabel: false, transferRemark: '', queryParams: { + enterCoilNo: '', + currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', transferNo: '', @@ -162,6 +165,19 @@ export default { this.loading = false; } }, + handleReset() { + this.queryParams = { + enterCoilNo: '', + currentCoilNo: '', + warehouseIdBefore: '', + warehouseIdAfter: '', + transferNo: '', + isTransferred: '0', + pageSize: 20, + pageNum: 1, + }; + this.handleRegularSearch(); + }, async handleRegularSearch() { this.loading = true; try { diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue index 068b2c1d..c85d2b79 100644 --- a/klp-ui/src/views/wms/move/record.vue +++ b/klp-ui/src/views/wms/move/record.vue @@ -15,6 +15,12 @@ + + + + + + @@ -39,6 +45,7 @@ 查询 + 清空 @@ -94,6 +101,8 @@ export default { enterCoilNo: '', }, queryParams: { + enterCoilNo: '', + currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', transferNo: '', @@ -158,6 +167,19 @@ export default { this.loading = false; } }, + handleReset() { + this.queryParams = { + enterCoilNo: '', + currentCoilNo: '', + warehouseIdBefore: '', + warehouseIdAfter: '', + transferNo: '', + isTransferred: '', + pageSize: 20, + pageNum: 1, + }; + this.handleRegularSearch(); + }, async handleRegularSearch() { this.loading = true; try { diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java index 40a70030..d26d92c6 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java @@ -84,4 +84,10 @@ public class WmsTransferOrderItemBo extends BaseEntity { // 重贴标签的备注 private String transferRemark; + + /** 入场钢卷号 */ + private String enterCoilNo; + + /** 当前钢卷号 */ + private String currentCoilNo; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java index a97153a3..43fb5ca9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java @@ -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 coilQuery = Wrappers.lambdaQuery(); + coilQuery.eq(StringUtils.isNotBlank(bo.getEnterCoilNo()), WmsMaterialCoil::getEnterCoilNo, bo.getEnterCoilNo()); + coilQuery.eq(StringUtils.isNotBlank(bo.getCurrentCoilNo()), WmsMaterialCoil::getCurrentCoilNo, bo.getCurrentCoilNo()); + List 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; }