From 5edc0b796602ba08547d9f6fa68916c791282a18 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 4 Sep 2025 10:32:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsInstockPrint、WmsInstockPrintBo 和 WmsInstockPrintVo 中添加质检状态字段 inspectionType
- 在 WmsInventoryMapper.xml 中添加 storeId 的查询条件，优化库存查询功能
---
 .../main/java/org/dromara/wms/domain/WmsInstockPrint.java   | 6 ++++++
 .../java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java   | 4 ++++
 .../java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java   | 5 +++++
 .../src/main/resources/mapper/wms/WmsInventoryMapper.xml    | 1 +
 4 files changed, 16 insertions(+)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java
index bc8a02b0..994eb672 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java
@@ -142,6 +142,11 @@ public class WmsInstockPrint{
      */
     private String inspectionRequest;
 
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
+    private String inspectionType;
+
     /**
      * 物料大类
      */
@@ -150,4 +155,5 @@ public class WmsInstockPrint{
 
 
 
+
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java
index 11415caf..a6fb4de2 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockPrintBo.java
@@ -126,6 +126,10 @@ public class WmsInstockPrintBo extends BaseEntity {
      * 质检要求(0必检,1免检)
      */
     private String inspectionRequest;
+
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
     private String inspectionType;
 
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java
index 94e0a0de..249f7b53 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java
@@ -161,4 +161,9 @@ public class WmsInstockPrintVo implements Serializable {
     // PDA 操作标题
     private String title;
 
+    /**
+     * 质检状态(0未发起，1质检中，2合格，3不合格）
+     */
+    private String inspectionType;
+
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
index 66d70915..388aac58 100644
--- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
+++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml
@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="entity.locationCode != null  and entity.locationCode != ''">and x.location_code like concat('%',#{entity.locationCode},'%')</if>
             <if test="entity.batchCode != null  and entity.batchCode != ''">and x.batch_code like concat('%',#{entity.batchCode},'%')</if>
             <if test="entity.materialCode != null  and entity.materialCode != ''">and x.material_code like concat('%',#{entity.materialCode},'%')</if>
+            <if test="entity.storeId != null  and entity.storeId != ''">and x.store_id = #{entity.storeId}</if>
         </where>
         group by
             x.warehouse_id ,