diff --git a/src/api/mes/wm/warehouse.js b/src/api/mes/wm/warehouse.js
new file mode 100644
index 0000000..0804e99
--- /dev/null
+++ b/src/api/mes/wm/warehouse.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仓库设置列表
+export function listWarehouse(query) {
+  return request({
+    url: '/mes/wm/warehouse/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓库设置详细
+export function getWarehouse(warehouseId) {
+  return request({
+    url: '/mes/wm/warehouse/' + warehouseId,
+    method: 'get'
+  })
+}
+
+// 新增仓库设置
+export function addWarehouse(data) {
+  return request({
+    url: '/mes/wm/warehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓库设置
+export function updateWarehouse(data) {
+  return request({
+    url: '/mes/wm/warehouse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库设置
+export function delWarehouse(warehouseId) {
+  return request({
+    url: '/mes/wm/warehouse/' + warehouseId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/md/unitmeasure/index.vue b/src/views/mes/md/unitmeasure/index.vue
index b1d4aed..86b8702 100644
--- a/src/views/mes/md/unitmeasure/index.vue
+++ b/src/views/mes/md/unitmeasure/index.vue
@@ -143,7 +143,7 @@
               </el-select>
         </el-form-item>
         <el-form-item label="与主单位换算比例" prop="changeRate" v-if="form.primaryFlag =='N'">
-          <el-input v-model="form.changeRate" placeholder="请输入与主单位换算比例" />
+          <el-input-number :step="1" :percision="2" v-model="form.changeRate" placeholder="请输入与主单位换算比例" />
         </el-form-item>
         <el-form-item label="是否启用" prop="enableFlag">
             <el-radio-group v-model="form.enableFlag">
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
new file mode 100644
index 0000000..c0e2b0a
--- /dev/null
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -0,0 +1,368 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="仓库编码" prop="warehouseCode">
+        <el-input
+          v-model="queryParams.warehouseCode"
+          placeholder="请输入仓库编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input
+          v-model="queryParams.warehouseName"
+          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="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['wm:warehouse:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wm:warehouse:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wm:warehouse:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="仓库编码" align="center" prop="warehouseCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:md:warehouse:query']"
+          >{{scope.row.warehouseCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+      <el-table-column label="位置" align="center" prop="location" :show-overflow-tooltip="true"/>
+      <el-table-column label="面积" align="center" prop="area" >
+        <template slot-scope="scope">
+          {{scope.row.area}} ㎡
+        </template>
+      </el-table-column>
+      <el-table-column label="负责人" align="center" prop="charge" />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-shop"
+            @click="handleLocation(scope.row.warehouseId)"
+            v-hasPermi="['wm:warehouse:edit']"
+          >设置库区</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wm:warehouse:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wm:warehouse:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仓库设置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="仓库编码" prop="warehouseCode">
+              <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库名称" prop="warehouseName">
+              <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="位置" prop="location">
+              <el-input v-model="form.location" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="面积" prop="area">
+              <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="charge">
+              <el-input v-model="form.charge" placeholder="请输入负责人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse } from "@/api/mes/wm/warehouse";
+import {genCode} from "@/api/system/autocode/rule"
+export default {
+  name: "Warehouse",
+  data() {
+    return {
+      //自动生成编码
+      autoGenFlag:false,
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仓库设置表格数据
+      warehouseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        warehouseCode: null,
+        warehouseName: null,
+        location: null,
+        area: null,
+        charge: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        warehouseCode: [
+          { required: true, message: "仓库编码不能为空", trigger: "blur" }
+        ],
+        warehouseName: [
+          { required: true, message: "仓库名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询仓库设置列表 */
+    getList() {
+      this.loading = true;
+      listWarehouse(this.queryParams).then(response => {
+        this.warehouseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        warehouseId: null,
+        warehouseCode: null,
+        warehouseName: null,
+        location: null,
+        area: null,
+        charge: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.warehouseId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仓库设置";
+      this.optType = "add";
+    },
+    // 查询明细按钮操作
+    handleView(row){
+      this.reset();
+      const warehouseId = row.warehouseId || this.ids
+      getWarehouse(warehouseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看仓库";
+        this.optType = "view";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const warehouseId = row.warehouseId || this.ids
+      getWarehouse(warehouseId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仓库设置";
+        this.optType = "edit";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.warehouseId != null) {
+            updateWarehouse(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addWarehouse(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const warehouseIds = row.warehouseId || this.ids;
+      this.$modal.confirm('是否确认删除仓库设置编号为"' + warehouseIds + '"的数据项？').then(function() {
+        return delWarehouse(warehouseIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wm/warehouse/export', {
+        ...this.queryParams
+      }, `warehouse_${new Date().getTime()}.xlsx`)
+    },
+    handleLocation(warehouseId){
+      this.$router.push({
+        path: "/mes/wm/location/index/"+warehouseId,
+        params: {'optType': this.optType}
+      });
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      debugger;
+      if(autoGenFlag){
+        genCode('WAREHOUSE_CODE').then(response =>{
+          this.form.warehouseCode = response;
+        });
+      }else{
+        this.form.warehouseCode = null;
+      }      
+    }
+  }
+};
+</script>