diff --git a/src/api/plan/bpworkorder.js b/src/api/plan/bpworkorder.js
index 281df1a..869f630 100644
--- a/src/api/plan/bpworkorder.js
+++ b/src/api/plan/bpworkorder.js
@@ -108,4 +108,13 @@ export function subChangeWorkOrderM(data){
 	  method:'post',
 	  data:data
 	})
-  }
\ No newline at end of file
+  }
+
+// 查询生产工单详细
+export function getBPNBomList(query) {
+	return request({
+		url: '/plan/bppro/workorder/getBPNBomList',
+		method: 'get',
+		params: query
+	});
+}
\ No newline at end of file
diff --git a/src/api/quality/cpkUpdown.js b/src/api/quality/cpkUpdown.js
index 9b9831f..0619e40 100644
--- a/src/api/quality/cpkUpdown.js
+++ b/src/api/quality/cpkUpdown.js
@@ -42,3 +42,12 @@ export function delCpkUpdown(id) {
         method: 'delete'
     });
 }
+
+// 查询物料检验标准列表
+export function listMaterialCheckStandar(query) {
+    return request({
+        url: '/quality/cpkUpdown/getMaterialCheckStandarList',
+        method: 'get',
+        params: query
+    });
+}
\ No newline at end of file
diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue
index 3c80610..48c3fc9 100644
--- a/src/views/kanban/dailyoutput/index.vue
+++ b/src/views/kanban/dailyoutput/index.vue
@@ -891,7 +891,7 @@ export default {
         factory: _this.selectxt,
         shiftId: _this.selectxtclasses,
         ymd: _this.datetime,
-        equTypeCode: "equ_type_spj",
+        equTypeCode: "equ_type_hf",
       }).then((response) => {
         if (response) {
           if (response.data) {
diff --git a/src/views/plan/workorderBP/bpBome.vue b/src/views/plan/workorderBP/bpBome.vue
new file mode 100644
index 0000000..5b32139
--- /dev/null
+++ b/src/views/plan/workorderBP/bpBome.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+  <el-dialog title="白坯BOM组成"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="700px"
+  >
+        <el-table v-loading="loading" :data="itemList" ref="myTable">
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
+          <el-table-column label="物料编码"  align="left" prop="productCode" width="230" />
+          <el-table-column label="物料名称"  align="left" prop="productName"   width="290" :show-overflow-tooltip="true"/>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button @click="cancelForm" >关 闭</el-button>
+       </div>
+  </el-dialog>
+
+  </div>
+</template>
+<script>
+
+import { getBPNBomList} from "@/api/plan/bpworkorder";
+import { getDictData,} from "@/api/system/dict/data";
+export default {
+  name: "itemSelectUser",
+  dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
+  data() {
+    return {
+      viewStatus : '0',
+      showFlag: false,
+      dyloading: false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+      qcCheckTaskDetails: [],
+      remarkList: [],
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        belongTo:''
+        //,userCode: '',
+        //userName : ''
+      },
+      data:{},
+      form:{
+        checkResult: 'Y',
+        startOA: '0',
+      },
+      dynamicValidateForm: {
+          domains: [{
+            value: ''
+          }],
+          sampleAql:null,
+          checkLevel:null
+      },
+      // 是否显示弹出层
+			valueOpen: false,
+      //检测详情的id
+      recordId:'',
+      weight: null,
+      //检测详情的belongTo
+      belongTo:'',
+      //检测类型
+      typeCode:'',
+      // 不良类型弹出层
+      defectOpen: false,
+      updateFlag: false,
+      //不良名称
+      defectList:[],
+      defectForm: {
+        defectItems: [
+          {defectSubclass: '',
+            defectCode: '',
+            noOkQuality: 0,
+            belongToDetail: '',
+            belongTo: ''
+          }
+        ]
+      },
+      rules: {
+
+      },
+      aqlNoOkVal:0,
+      sampleCode: null,
+      checkLevel:null
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    init(workorderId){
+      this.queryParams.workorderId = workorderId;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
+    },
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getBPNBomList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    reset() {
+			this.form = {
+        checkResult: null,
+        startOA: null,
+        materialType: null,
+        materialFrom: null,
+        remarkCode: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				projectType: null,
+			};
+			this.resetForm("form");
+		},
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    //取消
+    cancelForm() {
+       this.showFlag = false;
+       this.reset();
+    },
+   // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+};
+</script>
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index 7229e76..e73e812 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -174,6 +174,24 @@
           v-hasPermi="['mes:bppro:workorder:edit']"
         >湿料计划删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-guide" size="mini"
+        @click="handleAutoSplit"
+        :disabled="single">辅助排产
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-s-order" size="mini"
+        @click="handleBom"
+        :disabled="single">物料BOM
+        </el-button>
+      </el-col>
+       <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-guide" size="mini"
+        @click="handleSAPSync"
+        :disabled="single">SAP同步
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -630,6 +648,9 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    	<!--检验项目弹窗-->
+			<ItemBoms ref="itemSelectProject"></ItemBoms>
   </div>
 </template>
 
@@ -649,9 +670,10 @@ import moment from 'moment';
 import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
 import {prototype} from "clipboard";
 import {getHourProductionList} from '@/api/plan/whiteOrder';
-
+import ItemBoms from "./bpBome.vue";
 export default {
   name: "WorkorderBP",
+  components: { ItemBoms},
   dicts: ['product_type', 'workorder_type'],
   data() {
     return {
@@ -661,6 +683,7 @@ export default {
       checkType: false,
       // 暂存线体code
       proLineCode: null,
+      titleM: '',
       // 打印
       formRef: 'form',
       validateRules: [],
@@ -1782,6 +1805,19 @@ export default {
       }).catch(() => {
       });
     },
+    //辅助排产
+    handleAutoSplit(){
+      this.$modal.msgSuccess("功能建设中敬请期待");
+    },
+    handleSAPSync(){
+      this.$modal.msgSuccess("功能建设中敬请期待");
+    },
+    //查看白坯bom
+		handleBom(row){
+      const workorderIds = row.workorderId || this.ids;
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(workorderIds[0]);
+		},
   }
 };
 </script>
diff --git a/src/views/quality/materailCheckStandar/index.vue b/src/views/quality/materailCheckStandar/index.vue
new file mode 100644
index 0000000..179e23a
--- /dev/null
+++ b/src/views/quality/materailCheckStandar/index.vue
@@ -0,0 +1,195 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px">
+            <el-form-item label="物料编号" prop="materialCode">
+                <el-input
+                        v-model="queryParams.materialCode"
+                        placeholder="请输入物料号"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+                <el-input
+                        v-model="queryParams.materialName"
+                        placeholder="请输入物料名称"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="检验物料组名称" prop="groupName" label-width="120px">
+                <el-input
+                        v-model="queryParams.groupName"
+                        placeholder="请输入物料组名称"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="检验标准" prop="standNo">
+                <el-input
+                        v-model="queryParams.standNo"
+                        placeholder="请输入检验标准"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+              >导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="updownList" @selection-change="handleSelectionChange">
+            <!-- 序号 -->
+            <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
+            <el-table-column label="物料编码" width="150" align="center" prop="materialCode" :formatter="productCodeFormate"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"/>
+            <el-table-column label="检验标准" width="140" align="center" prop="standNo"/>
+            <el-table-column label="检验物料组名称" width="140" align="center" prop="groupName"/>
+            <el-table-column label="物料组编码" width="140" align="center" prop="productGroup"/>
+            <el-table-column label="物料组名称" width="120" align="center" prop="productGroupName"/>
+            <el-table-column label="工厂编码" width="120" align="center" prop="siteCode"/>
+        </el-table>
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+    </div>
+</template>
+
+<script>
+import {listMaterialCheckStandar } from "@/api/quality/cpkUpdown";
+    export default {
+        name: "MaterailCheckStandar",
+        dicts: ["check_type","qms_category"],
+        components: {},
+        data() {
+            return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            checkTypeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 物料CPK上下限维护表格数据
+            updownList: [],
+            projectNoOptions: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                typeCode: null,
+                checkType: null,
+                factoryCode: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: null
+            },
+            // 表单参数
+            form: {downVal:0,upVal:0},
+            // 表单校验
+            rules: {
+            }
+          };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+          /** 查询物料检验标准列表 */
+          getList() {
+              this.loading = true;
+              listMaterialCheckStandar(this.queryParams).then(response => {
+                  this.updownList = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          // 取消按钮
+          cancel() {
+              this.open = false;
+              this.reset();
+          },
+          // 表单重置
+          reset() {
+              this.form = {
+                id: null,
+                typeCode: null,
+                checkType: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                factoryCode: null,
+                delFlag: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: null
+              };
+              this.resetForm("form");
+          },
+          /** 搜索按钮操作 */
+          handleQuery() {
+              this.queryParams.pageNum = 1;
+              this.getList();
+          },
+          /** 重置按钮操作 */
+          resetQuery() {
+              this.resetForm("queryForm");
+              this.handleQuery();
+          },
+          // 多选框选中数据
+          handleSelectionChange(selection) {
+              this.ids = selection.map(item => item.id)
+              this.single = selection.length !== 1
+              this.multiple = !selection.length
+          },
+        /** 导出按钮操作 */
+        handleExport() {
+          this.download('quality/cpkUpdown/getMaterialCheckStandarExport', {
+            ...this.queryParams
+          }, `materialCheckStandar_${new Date().getTime()}.xlsx`)
+        },
+        // 生成表头序号
+        indexMethod(index) {
+          return index + 1;
+        },
+        //产品编码格式化
+        productCodeFormate(row, column, cellValue) {
+          if (cellValue != null) {
+            return cellValue.slice(7, 18); //返回值
+          }
+        }
+	}
+};
+</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 27e31bb..f3fea3f 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" >
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -35,6 +35,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="SAP设备名称/编码" prop="sapName"  label-width="150px">
+        <el-input
+          v-model="queryParams.sapName"
+          placeholder="请输入SAP设备名称/编码"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="设备类型" prop="equipmentTypeCode">
         <el-select
           v-model="queryParams.equipmentTypeCode"