diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
index 0d7cfd39..801e7d4a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
@@ -180,7 +180,8 @@ public class FlourworkServiceImpl implements FlourworkService {
         WQLObject devicePointTab = WQLObject.getWQLObject("SCH_BASE_DevicePointPara"); // 设备点位参数表
         WQLObject strucTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表
 
-        JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "'").uniqueResult(0);
+        JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "' and status <> '99'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonFormMst)) throw new BadRequestException("配方已完成");
         /*
          *  查询需要移库的物料（配方明细表）条件：
          *  1.状态等于10生成、20生产中
diff --git a/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue b/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
index e2400792..f9d98067 100644
--- a/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
+++ b/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
@@ -365,9 +365,6 @@ export default {
           'device_id': this.form.device_id,
           'formula_id': this.form.formula_id
         }
-        if (this.form.status !== '30') {
-          return this.crud.notify('配方状态必须为生产中', CRUD.NOTIFICATION_TYPE.INFO)
-        }
         this.fla = true
         crudFlourwork.autoCalledMater(data).then(res => {
           const num = res.task