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"
and x.location_code like concat('%',#{entity.locationCode},'%')
and x.batch_code like concat('%',#{entity.batchCode},'%')
and x.material_code like concat('%',#{entity.materialCode},'%')
+ and x.store_id = #{entity.storeId}
group by
x.warehouse_id ,