diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/vo/InventoryStockVo.java b/src/main/java/com/xujie/sys/modules/pms/entity/vo/InventoryStockVo.java
index 21d2a0cd..70b66b21 100644
--- a/src/main/java/com/xujie/sys/modules/pms/entity/vo/InventoryStockVo.java
+++ b/src/main/java/com/xujie/sys/modules/pms/entity/vo/InventoryStockVo.java
@@ -70,6 +70,7 @@ public class InventoryStockVo extends QueryPage implements Serializable {
 	private String active;
 
 	private Integer minStock;
+	private Integer maxStock;
 
 	private String minFlag;
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
index 281be949..844e5866 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/InventoryStockServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xujie.sys.common.utils.PageUtils;
+import com.xujie.sys.modules.pms.data.QcSamplingInspectionPlanData;
 import com.xujie.sys.modules.pms.entity.InventoryStockEntity;
 import com.xujie.sys.modules.pms.entity.vo.InventoryStockVo;
 import com.xujie.sys.modules.pms.mapper.InventoryStockMapper;
@@ -16,6 +17,8 @@ public class InventoryStockServiceImpl extends ServiceImpl<InventoryStockMapper,
 
     @Override
     public PageUtils queryPage(InventoryStockVo params) {
+//        IPage<QcSamplingInspectionPlanData> resultList = this.qcMapper.samplingInspectionPlanSearch(new Page<QcSamplingInspectionPlanData>(data.getPage(), data.getLimit()), data);
+//        return new PageUtils(resultList);
         IPage<InventoryStockVo> page = this.baseMapper.queryPage(
                 new Page<InventoryStockVo>(params.getPage(), params.getLimit()),
                 params
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index cc9a40fe..4e2055c9 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1891,7 +1891,7 @@
             ewo.checkResult
         FROM eam_workOrder as ewo
         LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID and ewo.bu_no = eo.bu_no
-        WHERE ewo.site = #{site} AND ewo.ObjectID = #{objectID} AND ewo.FunctionType = #{functionType} AND ewo.Status = '已完工' and ewo.bu_no = #{buNo}
+        WHERE ewo.site = #{site} AND ewo.ObjectID = #{objectID} AND ewo.FunctionType = #{functionType} AND (ewo.Status = '已完工' or ewo.Status = '待审核')and ewo.bu_no = #{buNo}
         ORDER BY ewo.ActualDate desc
     </select>
 
@@ -1912,7 +1912,7 @@
         LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID and ewo.bu_no = eo.bu_no
         LEFT JOIN eam_defect_feedBack as edf ON ewo.site = edf.site and ewo.PlanID = edf.FeedBackID and ewo.bu_no = edf.bu_no
         LEFT JOIN eam_defect as ed ON ed.DefectID = edf.DefectID
-        WHERE ewo.site = #{site} AND ewo.ObjectID = #{objectID} AND ewo.FunctionType = #{functionType} AND ewo.Status = '已完工' and ewo.bu_no = #{buNo} ORDER BY ewo.ActualDate desc
+        WHERE ewo.site = #{site} AND ewo.ObjectID = #{objectID} AND ewo.FunctionType = #{functionType} AND (ewo.Status = '已完工' or ewo.Status = '待审核') and ewo.bu_no = #{buNo} ORDER BY ewo.ActualDate desc
     </select>
 
     <!-- 查询部门列表 -->
diff --git a/src/main/resources/mapper/pms/InventoryStockMapper.xml b/src/main/resources/mapper/pms/InventoryStockMapper.xml
index 85cbe1f8..456434eb 100644
--- a/src/main/resources/mapper/pms/InventoryStockMapper.xml
+++ b/src/main/resources/mapper/pms/InventoryStockMapper.xml
@@ -46,7 +46,8 @@
             sum(isnull( A.qty_on_hand , 0 )) AS qtyOnHand,
             B.part_description,
             min(B.spec) AS spec,
-            sum(B.min_stock) AS min_stock,
+            B.min_stock,
+            B.max_stock,
             min(A.partner_id) AS partner_id,
             min(A.first_in_date) AS first_in_date
         from inventory_stock A
@@ -96,10 +97,10 @@
         </where>
         GROUP BY
         <if test="query.groupType == 0">
-            A.site,A.part_no,B.part_description ,A.batch_no
+            A.site,A.part_no,B.part_description ,A.batch_no, b.min_stock, b.max_stock
         </if>
         <if test="query.groupType == 1">
-             A.site,A.part_no,B.part_description
+             A.site,A.part_no,B.part_description,  b.min_stock, b.max_stock
         </if>
     </select>