From 3ef48d11839a839c1bfe6a7f441d4fe557b83466 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 12 Jan 2026 10:08:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(export):=20=E4=BF=AE=E6=AD=A3=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=A8=A1=E6=9D=BF=E4=B8=AD=E4=BA=A7=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将Excel导出模板中的"产品状态"字段更正为"产品质量"
- 保持了原有的数据映射逻辑不变
- 确保导出文件的字段名称与业务含义一致
---
 .../main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
index 4a316468..9624b5fa 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -90,7 +90,7 @@ public class WmsMaterialCoilExportVo {
     /**
      * 产品状态
      */
-    @ExcelProperty(value = "产品状态")
+    @ExcelProperty(value = "产品质量")
     private String qualityStatus;
 
     /**

From 7d4d85e9d64a946c7baa96e7a6c7526ab70f725b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 12 Jan 2026 10:21:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E5=BA=93=E5=8C=BAID=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除原有的actualWarehouseId简单相等查询条件
- 添加对actualWarehouseId为-1时的特殊处理逻辑
- 实现当actualWarehouseId为-1时查询actual_warehouse_id为空的记录
- 保持其他actualWarehouseId正常传值时的匹配逻辑
- 优化查询条件构建的代码结构
---
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 e092ffbb..a74dc47c 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
@@ -339,12 +339,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getWarehouseId() != null, "mc.warehouse_id", bo.getWarehouseId());
         qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit());
         qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
-        qw.eq(bo.getActualWarehouseId() != null, "mc.actual_warehouse_id", bo.getActualWarehouseId());
         qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
         qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "mc.create_by", bo.getCreateBy());
         qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "mc.update_by", bo.getUpdateBy());
         // 新增长度
         qw.eq(bo.getLength() != null, "mc.length", bo.getLength());
+        // 如果actualWarehouseId不为空，则根据实际库区ID进行查询 如果为-1,则查询无库区的数据
+        if (bo.getActualWarehouseId() != null) {
+            if (bo.getActualWarehouseId() == -1) {
+                // 当actualWarehouseId为-1时，查询actual_warehouse_id为空的记录（无库区）
+                qw.isNull("mc.actual_warehouse_id");
+            } else {
+                // 正常传值时，匹配具体的actualWarehouseId
+                qw.eq("mc.actual_warehouse_id", bo.getActualWarehouseId());
+            }
+        }
         // 新增查询逻辑也就是当saleId未空时候
         if (bo.getSaleId() != null) {
             if (bo.getSaleId() == -1) {