diff --git a/klp-ui/src/api/wms/order.js b/klp-ui/src/api/wms/order.js
new file mode 100644
index 00000000..37d96d74
--- /dev/null
+++ b/klp-ui/src/api/wms/order.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询订单主列表
+export function listOrder(query) {
+  return request({
+    url: '/wms/order/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单主详细
+export function getOrder(orderId) {
+  return request({
+    url: '/wms/order/' + orderId,
+    method: 'get'
+  })
+}
+
+// 新增订单主
+export function addOrder(data) {
+  return request({
+    url: '/wms/order',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单主
+export function updateOrder(data) {
+  return request({
+    url: '/wms/order',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单主
+export function delOrder(orderId) {
+  return request({
+    url: '/wms/order/' + orderId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/wms/orderDetail.js b/klp-ui/src/api/wms/orderDetail.js
new file mode 100644
index 00000000..e134549f
--- /dev/null
+++ b/klp-ui/src/api/wms/orderDetail.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询订单明细列表
+export function listOrderDetail(query) {
+  return request({
+    url: '/wms/orderDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单明细详细
+export function getOrderDetail(detailId) {
+  return request({
+    url: '/wms/orderDetail/' + detailId,
+    method: 'get'
+  })
+}
+
+// 新增订单明细
+export function addOrderDetail(data) {
+  return request({
+    url: '/wms/orderDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单明细
+export function updateOrderDetail(data) {
+  return request({
+    url: '/wms/orderDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单明细
+export function delOrderDetail(detailId) {
+  return request({
+    url: '/wms/orderDetail/' + detailId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/wms/productBom.js b/klp-ui/src/api/wms/productBom.js
new file mode 100644
index 00000000..27953287
--- /dev/null
+++ b/klp-ui/src/api/wms/productBom.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询产品BOM（产品-原材料清单）列表
+export function listProductBom(query) {
+  return request({
+    url: '/wms/productBom/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询产品BOM（产品-原材料清单）详细
+export function getProductBom(bomId) {
+  return request({
+    url: '/wms/productBom/' + bomId,
+    method: 'get'
+  })
+}
+
+// 新增产品BOM（产品-原材料清单）
+export function addProductBom(data) {
+  return request({
+    url: '/wms/productBom',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改产品BOM（产品-原材料清单）
+export function updateProductBom(data) {
+  return request({
+    url: '/wms/productBom',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除产品BOM（产品-原材料清单）
+export function delProductBom(bomId) {
+  return request({
+    url: '/wms/productBom/' + bomId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/components/KLPService/CategorySelect/index.vue b/klp-ui/src/components/KLPService/CategorySelect/index.vue
new file mode 100644
index 00000000..d63e047a
--- /dev/null
+++ b/klp-ui/src/components/KLPService/CategorySelect/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <el-select
+    v-model="innerValue"
+    :placeholder="placeholder"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filterable="filterable"
+    @change="onChange"
+  >
+    <el-option
+      v-for="item in categoryOptions"
+      :key="item.categoryId"
+      :label="item.categoryName"
+      :value="item.categoryId"
+    />
+  </el-select>
+</template>
+
+<script>
+import { listCategory } from '@/api/wms/category';
+
+export default {
+  name: 'CategorySelect',
+  props: {
+    value: {
+      type: [Number, String, null],
+      default: null
+    },
+    categoryType: {
+      type: String,
+      required: true,
+      validator: v => [
+        'base_material',
+        'surface_treatment',
+        'customer_req',
+        'spec_packaging'
+      ].includes(v)
+    },
+    placeholder: {
+      type: String,
+      default: '请选择分类'
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      categoryOptions: [],
+      innerValue: this.value
+    };
+  },
+  watch: {
+    value(val) {
+      this.innerValue = val;
+    },
+    categoryType: {
+      handler() {
+        this.loadOptions();
+      },
+      immediate: true
+    }
+  },
+  mounted() {
+    this.loadOptions();
+  },
+  methods: {
+    loadOptions() {
+      listCategory({ categoryType: this.categoryType, isEnabled: 1 }).then(res => {
+        this.categoryOptions = res.rows || [];
+      });
+    },
+    onChange(val) {
+      this.$emit('input', val);
+      this.$emit('change', val);
+    }
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
new file mode 100644
index 00000000..c1d0da50
--- /dev/null
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-select
+    v-model="selected"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    filterable
+    @change="onChange"
+    style="width: 100%"
+  >
+    <el-option
+      v-for="item in productOptions"
+      :key="item.productId"
+      :label="item.productName"
+      :value="item.productId"
+    />
+  </el-select>
+</template>
+
+<script>
+import { listProduct } from '@/api/wms/product';
+
+export default {
+  name: 'ProductSelect',
+  props: {
+    value: [String, Number],
+    disabled: Boolean,
+    placeholder: {
+      type: String,
+      default: '请选择产品'
+    }
+  },
+  data() {
+    return {
+      productOptions: [],
+      selected: this.value
+    };
+  },
+  watch: {
+    value(val) {
+      this.selected = val;
+    },
+    selected(val) {
+      this.$emit('input', val);
+      this.$emit('change', val);
+    }
+  },
+  created() {
+    this.getProductOptions();
+  },
+  methods: {
+    getProductOptions() {
+      listProduct({ pageNum: 1, pageSize: 1000 }).then(res => {
+        this.productOptions = res.rows || [];
+      });
+    },
+    onChange(val) {
+      this.$emit('change', val);
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/components/WarehouseSelect/index.vue b/klp-ui/src/components/WarehouseSelect/index.vue
new file mode 100644
index 00000000..05083c19
--- /dev/null
+++ b/klp-ui/src/components/WarehouseSelect/index.vue
@@ -0,0 +1,95 @@
+<template>
+  <treeselect
+    v-model="innerValue"
+    :options="warehouseOptions"
+    :normalizer="normalizer"
+    :placeholder="placeholder"
+    :clearable="clearable"
+    @input="onInput"
+  />
+</template>
+
+<script>
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import { listWarehouse } from '@/api/wms/warehouse';
+
+export default {
+  name: 'WarehouseSelect',
+  components: { Treeselect },
+  props: {
+    value: {
+      type: [Number, String, null],
+      default: null
+    },
+    placeholder: {
+      type: String,
+      default: '请选择库区/仓库/库位'
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    showTop: {
+      type: Boolean,
+      default: true // 是否显示顶级节点
+    }
+  },
+  data() {
+    return {
+      warehouseOptions: [],
+      innerValue: this.value
+    };
+  },
+  watch: {
+    value(val) {
+      this.innerValue = val;
+    }
+  },
+  mounted() {
+    this.loadOptions();
+  },
+  methods: {
+    loadOptions() {
+      listWarehouse().then(response => {
+        const options = [];
+        if (this.showTop) {
+          const top = { warehouseId: 0, warehouseName: '顶级节点', children: [] };
+          top.children = this.handleTree(response.data, 'warehouseId', 'parentId');
+          options.push(top);
+        } else {
+          options.push(...this.handleTree(response.data, 'warehouseId', 'parentId'));
+        }
+        this.warehouseOptions = options;
+      });
+    },
+    handleTree(data, id, parentId) {
+      const cloneData = JSON.parse(JSON.stringify(data));
+      return cloneData.filter(father => {
+        const branchArr = cloneData.filter(child => father[id] === child[parentId]);
+        if (branchArr.length > 0) father.children = branchArr;
+        return father[parentId] === 0 || father[parentId] === null;
+      });
+    },
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.warehouseId,
+        label: node.warehouseName,
+        children: node.children
+      };
+    },
+    onInput(val) {
+      // 选中顶级节点时，返回null
+      if (val === 0) {
+        this.$emit('input', null);
+        this.innerValue = null;
+      } else {
+        this.$emit('input', val);
+      }
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/category/index.vue b/klp-ui/src/views/wms/category/index.vue
index 14a76eea..84e38f99 100644
--- a/klp-ui/src/views/wms/category/index.vue
+++ b/klp-ui/src/views/wms/category/index.vue
@@ -1,8 +1,8 @@
 <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="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
-        <el-select v-model="queryParams.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)" clearable>
+      <el-form-item label="分类类型" prop="categoryType">
+        <el-select v-model="queryParams.categoryType" placeholder="请选择分类类型" clearable>
           <el-option
             v-for="dict in dict.type.category_type"
             :key="dict.value"
@@ -35,8 +35,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
-        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用(0=否,1=是)" clearable>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
           <el-option
             v-for="dict in dict.type.common_swicth"
             :key="dict.value"
@@ -59,7 +59,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['klp:category:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +69,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['klp:category:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -81,7 +79,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['klp:category:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -91,7 +88,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['klp:category:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,8 +95,7 @@
 
     <el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="分类主键ID" align="center" prop="categoryId" v-if="true"/>
-      <el-table-column label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" align="center" prop="categoryType">
+      <el-table-column label="分类类型" align="center" prop="categoryType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.category_type" :value="scope.row.categoryType"/>
         </template>
@@ -109,7 +104,7 @@
       <el-table-column label="分类名称" align="center" prop="categoryName" />
       <el-table-column label="分类描述" align="center" prop="categoryDesc" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用(0=否,1=是)" align="center" prop="isEnabled">
+      <el-table-column label="是否启用" align="center" prop="isEnabled">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
         </template>
@@ -121,14 +116,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['klp:category:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['klp:category:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -145,8 +138,8 @@
     <!-- 添加或修改通用分类对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
-          <el-select v-model="form.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)">
+        <el-form-item label="分类类型" prop="categoryType">
+          <el-select v-model="form.categoryType" placeholder="请选择分类类型">
             <el-option
               v-for="dict in dict.type.category_type"
               :key="dict.value"
@@ -167,8 +160,8 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
-          <el-select v-model="form.isEnabled" placeholder="请选择是否启用(0=否,1=是)">
+        <el-form-item label="是否启用" prop="isEnabled">
+          <el-select v-model="form.isEnabled" placeholder="请选择是否启用">
             <el-option
               v-for="dict in dict.type.common_swicth"
               :key="dict.value"
@@ -229,7 +222,7 @@ export default {
       // 表单校验
       rules: {
         categoryType: [
-          { required: true, message: "分类类型(base_material|surface_treatment|customer_req|spec_packaging)不能为空", trigger: "change" }
+          { required: true, message: "分类类型不能为空", trigger: "change" }
         ],
         categoryCode: [
           { required: true, message: "分类编码不能为空", trigger: "blur" }
@@ -352,7 +345,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('klp/category/export', {
+      this.download('wms/category/export', {
         ...this.queryParams
       }, `category_${new Date().getTime()}.xlsx`)
     }
diff --git a/klp-ui/src/views/wms/order/index.vue b/klp-ui/src/views/wms/order/index.vue
new file mode 100644
index 00000000..698fa0a3
--- /dev/null
+++ b/klp-ui/src/views/wms/order/index.vue
@@ -0,0 +1,319 @@
+<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="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入订单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售经理" prop="salesManager">
+        <el-input
+          v-model="queryParams.salesManager"
+          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="['klp:order: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="['klp:order: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="['klp:order:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['klp:order:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单ID" align="center" prop="orderId" v-if="false"/>
+      <el-table-column label="订单编号" align="center" prop="orderCode" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="销售经理" align="center" prop="salesManager" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['klp:order:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['klp:order:remove']"
+          >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="showDetail(scope.row)"
+          >明细</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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="订单编号" prop="orderCode">
+          <el-input v-model="form.orderCode" placeholder="请输入订单编号" />
+        </el-form-item>
+        <el-form-item label="客户名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="销售经理" prop="salesManager">
+          <el-input v-model="form.salesManager" placeholder="请输入销售经理" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 订单明细弹窗 -->
+    <el-dialog title="订单明细" :visible.sync="detailDialogVisible" width="900px" append-to-body>
+      <OrderDetailPanel :orderId="detailOrderId" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/wms/order";
+import OrderDetailPanel from './panels/detail.vue';
+
+export default {
+  name: "Order",
+  components: { OrderDetailPanel },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单主表格数据
+      orderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderCode: undefined,
+        customerName: undefined,
+        salesManager: undefined,
+        orderStatus: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      detailDialogVisible: false,
+      detailOrderId: null,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单主列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.queryParams).then(response => {
+        this.orderList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        orderId: undefined,
+        orderCode: undefined,
+        customerName: undefined,
+        salesManager: undefined,
+        orderStatus: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.orderId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单主";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const orderId = row.orderId || this.ids
+      getOrder(orderId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单主";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.orderId != null) {
+            updateOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orderIds = row.orderId || this.ids;
+      this.$modal.confirm('是否确认删除订单主编号为"' + orderIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delOrder(orderIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/order/export', {
+        ...this.queryParams
+      }, `order_${new Date().getTime()}.xlsx`)
+    },
+    showDetail(row) {
+      this.detailOrderId = row.orderId;
+      this.detailDialogVisible = true;
+    },
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/order/panels/detail.vue b/klp-ui/src/views/wms/order/panels/detail.vue
new file mode 100644
index 00000000..0f408a8c
--- /dev/null
+++ b/klp-ui/src/views/wms/order/panels/detail.vue
@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="orderDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="明细ID" align="center" prop="detailId" v-if="false"/>
+      <el-table-column label="订单ID" align="center" prop="orderId" />
+      <el-table-column label="产品ID" align="center" prop="productId" />
+      <el-table-column label="产品数量" align="center" prop="quantity" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="订单ID" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单ID" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="产品ID" prop="productId">
+          <ProductSelect v-model="form.productId" />
+        </el-form-item>
+        <el-form-item label="产品数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入产品数量" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOrderDetail, getOrderDetail, delOrderDetail, addOrderDetail, updateOrderDetail } from "@/api/wms/orderDetail";
+import ProductSelect from '@/components/KLPService/ProductSelect';
+
+export default {
+  name: "OrderDetailPanel",
+  props: {
+    orderId: {
+      type: [String, Number],
+      required: true
+    }
+  },
+  data() {
+    return {
+      buttonLoading: false,
+      loading: true,
+      ids: [],
+      single: true,
+      multiple: true,
+      total: 0,
+      orderDetailList: [],
+      title: "",
+      open: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: this.orderId,
+        productId: undefined,
+        quantity: undefined,
+        unit: undefined,
+      },
+      form: {
+        orderId: this.orderId
+      },
+      rules: {
+        orderId: [
+          { required: true, message: "订单ID不能为空", trigger: "blur" }
+        ],
+        productId: [
+          { required: true, message: "产品ID不能为空", trigger: "blur" }
+        ],
+        quantity: [
+          { required: true, message: "产品数量不能为空", trigger: "blur" }
+        ],
+        unit: [
+          { required: true, message: "单位不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  watch: {
+    orderId(newVal) {
+      this.queryParams.orderId = newVal;
+      this.form.orderId = newVal;
+      this.getList();
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listOrderDetail(this.queryParams).then(response => {
+        this.orderDetailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    reset() {
+      this.form = {
+        detailId: undefined,
+        orderId: this.orderId,
+        productId: undefined,
+        quantity: undefined,
+        unit: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined
+      };
+      this.resetForm && this.resetForm("form");
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.detailId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单明细";
+    },
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const detailId = row.detailId || this.ids
+      getOrderDetail(detailId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改订单明细";
+      });
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.detailId != null) {
+            updateOrderDetail(this.form).then(response => {
+              this.$modal && this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addOrderDetail(this.form).then(response => {
+              this.$modal && this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    handleDelete(row) {
+      const detailIds = row.detailId || this.ids;
+      this.$modal && this.$modal.confirm('是否确认删除订单明细编号为"' + detailIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delOrderDetail(detailIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal && this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    handleExport() {
+      this.download && this.download('wms/orderDetail/export', {
+        ...this.queryParams
+      }, `orderDetail_${new Date().getTime()}.xlsx`)
+    }
+  },
+  components: {
+    ProductSelect
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index 7b0478bb..e4737876 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -25,37 +25,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基础材质分类ID" prop="baseMaterialId">
-        <el-input
-          v-model="queryParams.baseMaterialId"
-          placeholder="请输入基础材质分类ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="基础材质分类" prop="baseMaterialId">
+        <CategorySelect v-model="queryParams.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
       </el-form-item>
-      <el-form-item label="表面处理分类ID" prop="surfaceTreatmentId">
-        <el-input
-          v-model="queryParams.surfaceTreatmentId"
-          placeholder="请输入表面处理分类ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+        <CategorySelect v-model="queryParams.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
       </el-form-item>
-      <el-form-item label="客户需求分类ID" prop="customerReqId">
-        <el-input
-          v-model="queryParams.customerReqId"
-          placeholder="请输入客户需求分类ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="客户需求分类" prop="customerReqId">
+        <CategorySelect v-model="queryParams.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
       </el-form-item>
-      <el-form-item label="包装分类ID" prop="packagingId">
-        <el-input
-          v-model="queryParams.packagingId"
-          placeholder="请输入包装分类ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="包装分类" prop="packagingId">
+        <CategorySelect v-model="queryParams.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
       </el-form-item>
       <el-form-item label="厚度" prop="thickness">
         <el-input
@@ -195,17 +175,17 @@
         <el-form-item label="负责人" prop="owner">
           <el-input v-model="form.owner" placeholder="请输入负责人" />
         </el-form-item>
-        <el-form-item label="基础材质分类ID" prop="baseMaterialId">
-          <el-input v-model="form.baseMaterialId" placeholder="请输入基础材质分类ID" />
+        <el-form-item label="基础材质分类" prop="baseMaterialId">
+          <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
         </el-form-item>
-        <el-form-item label="表面处理分类ID" prop="surfaceTreatmentId">
-          <el-input v-model="form.surfaceTreatmentId" placeholder="请输入表面处理分类ID" />
+        <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+          <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
         </el-form-item>
-        <el-form-item label="客户需求分类ID" prop="customerReqId">
-          <el-input v-model="form.customerReqId" placeholder="请输入客户需求分类ID" />
+        <el-form-item label="客户需求分类" prop="customerReqId">
+          <CategorySelect v-model="form.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
         </el-form-item>
-        <el-form-item label="包装分类ID" prop="packagingId">
-          <el-input v-model="form.packagingId" placeholder="请输入包装分类ID" />
+        <el-form-item label="包装分类" prop="packagingId">
+          <CategorySelect v-model="form.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
         </el-form-item>
         <el-form-item label="厚度" prop="thickness">
           <el-input v-model="form.thickness" placeholder="请输入厚度" />
@@ -230,9 +210,13 @@
 
 <script>
 import { listProduct, getProduct, delProduct, addProduct, updateProduct } from "@/api/wms/product";
+import CategorySelect from '@/components/KLPService/CategorySelect';
 
 export default {
   name: "Product",
+  components: {
+    CategorySelect
+  },
   data() {
     return {
       // 按钮loading
@@ -425,7 +409,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('klp/product/export', {
+      this.download('wms/product/export', {
         ...this.queryParams
       }, `product_${new Date().getTime()}.xlsx`)
     }
diff --git a/klp-ui/src/views/wms/productBom/index.vue b/klp-ui/src/views/wms/productBom/index.vue
new file mode 100644
index 00000000..9cc6e854
--- /dev/null
+++ b/klp-ui/src/views/wms/productBom/index.vue
@@ -0,0 +1,318 @@
+<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="产品ID" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入产品ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原材料ID" prop="rawMaterialId">
+        <el-input
+          v-model="queryParams.rawMaterialId"
+          placeholder="请输入原材料ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="每个产品所需原材料数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入每个产品所需原材料数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          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="['wms:productBom: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="['wms:productBom: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="['wms:productBom:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:productBom:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="productBomList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="BOM主键ID" align="center" prop="bomId" v-if="true"/>
+      <el-table-column label="产品ID" align="center" prop="productId" />
+      <el-table-column label="原材料ID" align="center" prop="rawMaterialId" />
+      <el-table-column label="每个产品所需原材料数量" align="center" prop="quantity" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['wms:productBom:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wms:productBom: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"
+    />
+
+    <!-- 添加或修改产品BOM（产品-原材料清单）对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产品ID" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入产品ID" />
+        </el-form-item>
+        <el-form-item label="原材料ID" prop="rawMaterialId">
+          <el-input v-model="form.rawMaterialId" placeholder="请输入原材料ID" />
+        </el-form-item>
+        <el-form-item label="每个产品所需原材料数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入每个产品所需原材料数量" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProductBom, getProductBom, delProductBom, addProductBom, updateProductBom } from "@/api/wms/productBom";
+
+export default {
+  name: "ProductBom",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产品BOM（产品-原材料清单）表格数据
+      productBomList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productId: undefined,
+        rawMaterialId: undefined,
+        quantity: undefined,
+        unit: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        productId: [
+          { required: true, message: "产品ID不能为空", trigger: "blur" }
+        ],
+        rawMaterialId: [
+          { required: true, message: "原材料ID不能为空", trigger: "blur" }
+        ],
+        quantity: [
+          { required: true, message: "每个产品所需原材料数量不能为空", trigger: "blur" }
+        ],
+        unit: [
+          { required: true, message: "单位不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询产品BOM（产品-原材料清单）列表 */
+    getList() {
+      this.loading = true;
+      listProductBom(this.queryParams).then(response => {
+        this.productBomList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        bomId: undefined,
+        productId: undefined,
+        rawMaterialId: undefined,
+        quantity: undefined,
+        unit: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.bomId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加产品BOM（产品-原材料清单）";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const bomId = row.bomId || this.ids
+      getProductBom(bomId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改产品BOM（产品-原材料清单）";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.bomId != null) {
+            updateProductBom(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addProductBom(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const bomIds = row.bomId || this.ids;
+      this.$modal.confirm('是否确认删除产品BOM（产品-原材料清单）编号为"' + bomIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delProductBom(bomIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/productBom/export', {
+        ...this.queryParams
+      }, `productBom_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/productionLine/index.vue b/klp-ui/src/views/wms/productionLine/index.vue
index a72db0eb..01c503f8 100644
--- a/klp-ui/src/views/wms/productionLine/index.vue
+++ b/klp-ui/src/views/wms/productionLine/index.vue
@@ -32,7 +32,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['klp:productionLine:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,7 +42,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['klp:productionLine:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -54,7 +52,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['klp:productionLine:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -64,7 +61,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['klp:productionLine:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -97,14 +93,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['klp:productionLine:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['klp:productionLine:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -324,7 +318,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('klp/productionLine/export', {
+      this.download('wms/productionLine/export', {
         ...this.queryParams
       }, `productionLine_${new Date().getTime()}.xlsx`)
     },
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index 318742ac..5ae17ac8 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -113,62 +113,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="硬度" prop="hardnessHv5">
-        <el-input
-          v-model="queryParams.hardnessHv5"
-          placeholder="请输入硬度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="硬度差值" prop="hardnessDiff">
-        <el-input
-          v-model="queryParams.hardnessDiff"
-          placeholder="请输入硬度差值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="锰含量Mn" prop="compositionMn">
-        <el-input
-          v-model="queryParams.compositionMn"
-          placeholder="请输入锰含量Mn"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="磷含量P" prop="compositionP">
-        <el-input
-          v-model="queryParams.compositionP"
-          placeholder="请输入磷含量P"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="晶粒级别" prop="grainSize">
-        <el-input
-          v-model="queryParams.grainSize"
-          placeholder="请输入晶粒级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="头尾切除标记" prop="headTailCutFlag">
-        <el-input
-          v-model="queryParams.headTailCutFlag"
-          placeholder="请输入头尾切除标记"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="检测结论" prop="inspectionResult">
-        <el-input
-          v-model="queryParams.inspectionResult"
-          placeholder="请输入检测结论"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="是否启用" prop="isEnabled">
         <el-input
           v-model="queryParams.isEnabled"
@@ -246,13 +190,6 @@
       <el-table-column label="凸度" align="center" prop="crown" />
       <el-table-column label="卷重" align="center" prop="coilWeight" />
       <el-table-column label="表面质量" align="center" prop="surfaceQuality" />
-      <el-table-column label="硬度" align="center" prop="hardnessHv5" />
-      <el-table-column label="硬度差值" align="center" prop="hardnessDiff" />
-      <el-table-column label="锰含量Mn" align="center" prop="compositionMn" />
-      <el-table-column label="磷含量P" align="center" prop="compositionP" />
-      <el-table-column label="晶粒级别" align="center" prop="grainSize" />
-      <el-table-column label="头尾切除标记" align="center" prop="headTailCutFlag" />
-      <el-table-column label="检测结论" align="center" prop="inspectionResult" />
       <el-table-column label="是否启用" align="center" prop="isEnabled" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -262,14 +199,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['klp:rawMaterial:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['klp:rawMaterial:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -328,24 +263,6 @@
         <el-form-item label="表面质量" prop="surfaceQuality">
           <el-input v-model="form.surfaceQuality" placeholder="请输入表面质量" />
         </el-form-item>
-        <el-form-item label="硬度" prop="hardnessHv5">
-          <el-input v-model="form.hardnessHv5" placeholder="请输入硬度" />
-        </el-form-item>
-        <el-form-item label="硬度差值" prop="hardnessDiff">
-          <el-input v-model="form.hardnessDiff" placeholder="请输入硬度差值" />
-        </el-form-item>
-        <el-form-item label="锰含量Mn" prop="compositionMn">
-          <el-input v-model="form.compositionMn" placeholder="请输入锰含量Mn" />
-        </el-form-item>
-        <el-form-item label="磷含量P" prop="compositionP">
-          <el-input v-model="form.compositionP" placeholder="请输入磷含量P" />
-        </el-form-item>
-        <el-form-item label="晶粒级别" prop="grainSize">
-          <el-input v-model="form.grainSize" placeholder="请输入晶粒级别" />
-        </el-form-item>
-        <el-form-item label="头尾切除标记" prop="headTailCutFlag">
-          <el-input v-model="form.headTailCutFlag" placeholder="请输入头尾切除标记" />
-        </el-form-item>
         <el-form-item label="检测结论" prop="inspectionResult">
           <el-input v-model="form.inspectionResult" placeholder="请输入检测结论" />
         </el-form-item>
@@ -464,24 +381,6 @@ export default {
         surfaceQuality: [
           { required: true, message: "表面质量不能为空", trigger: "blur" }
         ],
-        hardnessHv5: [
-          { required: true, message: "硬度不能为空", trigger: "blur" }
-        ],
-        hardnessDiff: [
-          { required: true, message: "硬度差值不能为空", trigger: "blur" }
-        ],
-        compositionMn: [
-          { required: true, message: "锰含量Mn不能为空", trigger: "blur" }
-        ],
-        compositionP: [
-          { required: true, message: "磷含量P不能为空", trigger: "blur" }
-        ],
-        grainSize: [
-          { required: true, message: "晶粒级别不能为空", trigger: "blur" }
-        ],
-        headTailCutFlag: [
-          { required: true, message: "头尾切除标记不能为空", trigger: "blur" }
-        ],
         inspectionResult: [
           { required: true, message: "检测结论不能为空", trigger: "blur" }
         ],
@@ -620,7 +519,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('klp/rawMaterial/export', {
+      this.download('wms/rawMaterial/export', {
         ...this.queryParams
       }, `rawMaterial_${new Date().getTime()}.xlsx`)
     }
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index b4778ee3..ed1687c4 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -337,7 +337,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('klp/stock/export', {
+      this.download('wms/stock/export', {
         ...this.queryParams
       }, `stock_${new Date().getTime()}.xlsx`)
     }
diff --git a/klp-ui/src/views/wms/warehouse/index.vue b/klp-ui/src/views/wms/warehouse/index.vue
index b4737447..cbc1cb92 100644
--- a/klp-ui/src/views/wms/warehouse/index.vue
+++ b/klp-ui/src/views/wms/warehouse/index.vue
@@ -1,14 +1,6 @@
 <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="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请选择上级节点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="仓库编码" prop="warehouseCode">
         <el-input
           v-model="queryParams.warehouseCode"
@@ -35,14 +27,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="排序号" prop="sortNo">
-        <el-input
-          v-model="queryParams.sortNo"
-          placeholder="请输入排序号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="启用状态" prop="isEnabled">
         <el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
           <el-option label="启用" :value="1" />
@@ -86,7 +70,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="上级节点" prop="parentId" />
+      <!-- <el-table-column label="上级节点" prop="parentId" /> -->
       <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="仓库类型" align="center" prop="warehouseType">
@@ -129,7 +113,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="上级节点" prop="parentId">
-          <treeselect v-model="form.parentId" :options="warehouseOptions" :normalizer="normalizer" placeholder="请选择上级节点" />
+          <WarehouseSelect v-model="form.parentId" placeholder="请选择上级节点" />
         </el-form-item>
         <el-form-item label="仓库编码" prop="warehouseCode">
           <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
@@ -172,12 +156,14 @@
 import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse } from "@/api/wms/warehouse";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import WarehouseSelect from '@/components/WarehouseSelect';
 
 export default {
   name: "Warehouse",
   dicts: ['warehouse_type'],
   components: {
-    Treeselect
+    Treeselect,
+    WarehouseSelect
   },
   data() {
     return {
@@ -205,7 +191,7 @@ export default {
         warehouseCode: undefined,
         warehouseName: undefined,
         warehouseType: undefined,
-        sortNo: undefined,
+        sortNo: 0,
         isEnabled: undefined,
       },
       // 表单参数
@@ -328,9 +314,14 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-		  this.buttonLoading = true;
+          this.buttonLoading = true;
+          // 处理 parentId 为 0 的情况
+          let submitData = { ...this.form };
+          if (submitData.parentId === 0) {
+            delete submitData.parentId;
+          }
           if (this.form.warehouseId != null) {
-            updateWarehouse(this.form).then(response => {
+            updateWarehouse(submitData).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -338,7 +329,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addWarehouse(this.form).then(response => {
+            addWarehouse(submitData).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();