From e4f1c8d2b1970d0521f917bd96a7514c204f3ae2 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Thu, 28 May 2026 10:56:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/move):=20=E6=96=B0=E5=A2=9E=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E8=AE=B0=E5=BD=95=E7=9A=84=E5=85=A5=E5=9C=BA=E5=8D=B7?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=BD=93=E5=89=8D=E5=8D=B7=E5=8F=B7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 前端在移库操作和记录页面新增入场卷号和当前卷号查询字段，并添加清空按钮
2. 后端在WmsTransferOrderItemBo中新增enterCoilNo和currentCoilNo字段
3. 在WmsTransferOrderItemServiceImpl中实现根据入场/当前钢卷号查询钢卷ID并过滤移库记录的逻辑
4. 优化查询条件处理，当无匹配钢卷时返回空结果集
---
 klp-ui/src/views/wms/move/do.vue              | 20 +++++++++++++++--
 klp-ui/src/views/wms/move/record.vue          | 22 +++++++++++++++++++
 .../klp/domain/bo/WmsTransferOrderItemBo.java |  6 +++++
 .../impl/WmsTransferOrderItemServiceImpl.java | 14 ++++++++++++
 4 files changed, 60 insertions(+), 2 deletions(-)

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 @@
   <div class="record-container">
     <!-- 常规筛选区, 通过调拨前库区和调拨后库区查询 -->
     <el-form :model="queryParams" inline>
-      <!-- <el-form-item label="入场卷号">
+      <el-form-item label="入场卷号">
         <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场卷号"></el-input>
       </el-form-item>
       <el-form-item label="当前卷号">
         <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前卷号"></el-input>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="调拨前库区">
         <WarehouseSelect v-model="queryParams.warehouseIdBefore" placeholder="请选择调拨前库区">
         </WarehouseSelect>
@@ -33,6 +33,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" plain @click="handleRegularSearch">查询</el-button>
         <el-button type="success" icon="el-icon-check" plain @click="handleConfirmBatch">批量执行</el-button>
+        <el-button @click="handleReset">清空</el-button>
       </el-form-item>
     </el-form>
 
@@ -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 @@
 
     <!-- 常规筛选区, 通过调拨前库区和调拨后库区查询 -->
     <el-form :model="queryParams" inline>
+      <el-form-item label="入场卷号">
+        <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场卷号"></el-input>
+      </el-form-item>
+      <el-form-item label="当前卷号">
+        <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前卷号"></el-input>
+      </el-form-item>
       <el-form-item label="调拨前库区">
         <WarehouseSelect v-model="queryParams.warehouseIdBefore" placeholder="请选择调拨前库区">
         </WarehouseSelect>
@@ -39,6 +45,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleRegularSearch">查询</el-button>
+        <el-button @click="handleReset">清空</el-button>
       </el-form-item>
     </el-form>
 
@@ -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<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;
     }