From 4d588985e8baa5b4b13526709eb901af06e2583a Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 18 Apr 2026 10:17:22 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E7=B1=BB=E5=9E=8B=E9=9D=9E=E7=A9=BA=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

- 在WmsMaterialCoilBo中新增hasTransferType字段用于标识是否查询调拨类型不为空的钢卷
- 在WmsMaterialCoilServiceImpl中实现调拨类型非空筛选逻辑
- 当hasTransferType为true时查询调拨类型不为空且不为字符串的钢卷记录
---
 .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java  | 6 ++++++
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index fbc352ef..31e81007 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -354,5 +354,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
 
     //根据逗号分割的创建人筛选
     private String createBys;
+
+    /**
+     * 是否查询调拨类型不为空的钢卷
+     */
+    @TableField(exist = false)
+    private Boolean hasTransferType;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 951cc141..f9d2c5b2 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -576,6 +576,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getCoilSurfaceTreatment() != null, "mc.coil_surface_treatment", bo.getCoilSurfaceTreatment());
         // 调拨类型
         qw.eq(StringUtils.isNotBlank(bo.getTransferType()), "mc.transfer_type", bo.getTransferType());
+        // 查询调拨类型不为空的钢卷
+        if (Boolean.TRUE.equals(bo.getHasTransferType())) {
+            qw.isNotNull("mc.transfer_type");
+            qw.ne("mc.transfer_type", "");
+        }
         // 如果actualWarehouseId不为空，则根据实际库区ID进行查询 如果为-1,则查询无库区的数据
         if (bo.getActualWarehouseId() != null) {
             if (bo.getActualWarehouseId() == -1) {