diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java
index 332fbd63..236ed0cd 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceMaOrderDetailDao.java
@@ -23,4 +23,12 @@ public interface DeviceMaOrderDetailDao {
     List<DeviceMAOrderDetailResponse> filterList(FilterDeviceMAOrderDetailRequest detailRequest);
 
     void deleteByOrderId(@Param("orderIdFk") String orderIdFk);
+
+    /**
+     * 查询此设备养护及
+     *
+     * @param orderId
+     * @return
+     */
+    List<DeviceMAOrderDetailEntity> selectByOrderId(@Param("orderId") String orderId);
 }
\ No newline at end of file
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java
index 4fa4b63c..6374bc40 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterDeviceMAOrderRequest.java
@@ -16,4 +16,14 @@ public class FilterDeviceMAOrderRequest extends ListPageRequest {
      */
     private String orderId;
 
+    /**
+     * 设备领用记录号
+     */
+    private String collOrderId;
+
+    /**
+     * 状态 0：草稿  1：已完成
+     */
+    private Integer status;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
index 42d44a3f..ee543267 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
@@ -96,6 +96,15 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
         if (null == deviceMAOrderEntity.getId() || StrUtil.isBlank(deviceMAOrderEntity.getOrderId())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        if (deviceMAOrderEntity.getStatus() == 1) {
+            //完成养护记录更新，查询此条养护记录详情中是否存在未养护完成设备
+           List<DeviceMAOrderDetailEntity> detailList = deviceMaOrderDetailDao.selectByOrderId(deviceMAOrderEntity.getOrderId());
+            for (DeviceMAOrderDetailEntity deviceMAOrderDetailEntity : detailList) {
+                if (deviceMAOrderDetailEntity.getMaintenanceStatus() == 0) {
+                    return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "存在未养护设备，请完成该设备养护！");
+                }
+            }
+        }
         deviceMAOrderDao.updateByPrimaryKey(deviceMAOrderEntity);
         return ResultVOUtils.success("更新成功");
     }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
index 6351b0ff..e0556375 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
@@ -170,6 +170,6 @@
     </select>
 
     <update id="updateStatusById">
-        update device_collect_order set status = #{status} and id = #{id}
+        update device_collect_order set status = #{status} where id = #{id}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml
index ca176377..4d402246 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDao.xml
@@ -150,12 +150,19 @@
     </update>
 
     <select id="filterList" resultType="com.glxp.api.admin.entity.inventory.DeviceMAOrderEntity">
-        select <include refid="Base_Column_List" />
+        select
+        <include refid="Base_Column_List"/>
         from device_ma_order
         <where>
             <if test="orderId != null and orderId != ''">
                 AND orderId like concat('%', #{orderId}, '%')
             </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="collOrderId != null and collOrderId != ''">
+                AND collOrderId like concat('%', #{collOrderId}, '%')
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
index a937b00b..46da97d1 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
@@ -261,4 +261,9 @@
     <delete id="deleteByOrderId">
         delete from device_ma_order_detail where orderIdFk = #{orderIdFk}
     </delete>
+
+    <select id="selectByOrderId" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />
+        from device_ma_order_detail where orderIdFk = #{orderId}
+    </select>
 </mapper>
\ No newline at end of file