From b2f789ca7fa7ed99f13d65c388dae6c8fba96182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 12 Jun 2026 19:50:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(qrcode):=20=E6=B7=BB=E5=8A=A0=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E6=B5=81=E7=A8=8B=E4=BD=8D=E7=BD=AE=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 QrCodeItemSearchQO 中新增 processStage 字段用于流程位置筛选
- 在 WmsQrCodeMasterMapper.xml 中添加流程阶段条件查询逻辑
- 实现根据条码流程位置进行数据过滤的功能
- 支持通过 processStage 参数精确匹配条码当前处理阶段
- 优化查询条件以提升条码检索的准确性
---
 .../java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java | 5 +++++
 .../src/main/resources/mapper/WmsQrCodeMasterMapper.xml      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java
index c7bb15e8..2e5539fb 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java
@@ -21,4 +21,9 @@ public class QrCodeItemSearchQO extends SearchBaseQO {
      * 库存地点
      */
     private String storageLocation;
+
+    /**
+     * 条码流程位置
+     */
+    private Short processStage;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
index 02f70b51..9804cbae 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
@@ -37,6 +37,9 @@
                  left join user_supplier d on a.supplier_id = d."id"
 <!--                 left join wms_qr_code_master f on f.parent_barcode_id = a.id and f.process_stage = 6-->
         where a.parent_barcode_id = 0
+        <if test="request.processStage !=null">
+            and a.process_stage =#{request.processStage}
+        </if>
         <if test="request.barcodeCode !=null and request.barcodeCode !=''">
             and a.barcode_code =#{request.barcodeCode}
         </if>