diff --git a/src/views/wms/baseMaterialInfo/addMaterialInWMS.vue b/src/views/wms/baseMaterialInfo/addMaterialInWMS.vue
index eb37416..670b109 100644
--- a/src/views/wms/baseMaterialInfo/addMaterialInWMS.vue
+++ b/src/views/wms/baseMaterialInfo/addMaterialInWMS.vue
@@ -27,135 +27,131 @@
     </transition>
 
     <el-card shadow="never">
+    <el-table v-loading="loading"
+              :data="baseMaterialInfoList"
+              ref="tableRef"
+              @selection-change="handleSelectionChange"
+              @row-click="handleRowClick"
+              highlight-current-row
+    >
+      <el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
+      <el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
+      <el-table-column label="物料类型" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
 
-      <el-table v-loading="loading"
-                :data="baseMaterialInfoList"
-                ref="tableRef"
-                @selection-change="handleSelectionChange"
-                @row-click="handleRowClick"
-                highlight-current-row
-      >
-        <!--        <el-table-column type="selection" width="55" align="center" />-->
-        <!--        <el-table-column label="主键标识" align="center" prop="materialId" v-if="columns[0].visible"/>-->
-        <!--        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
-        <el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
-        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
-        <el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
-        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
-        <el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
-
-        </el-table-column>
-        <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>
-        <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">
-          <template #default="scope">
-            <dict-tag :options="mes_batch_flag" :value="scope.row.batchFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="小批次数量" align="center" prop="batchAmount" v-if="columns[8].visible"/>
-        <el-table-column label="计量单位ID" align="center" prop="materialUnitId" v-if="columns[9].visible"/>
-        <el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[10].visible" width="120"/>
-        <el-table-column label="物料组" align="center" prop="materialMatkl" v-if="columns[11].visible"/>
-        <el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[12].visible"/>
-        <el-table-column label="净重" align="center" prop="netWeight" v-if="columns[13].visible"/>
-        <el-table-column label="毛重" align="center" prop="grossWeight" v-if="columns[14].visible"/>
-        <el-table-column label="绑定标识" align="center" prop="alwaysFlag" v-if="columns[15].visible">
-          <template #default="scope">
-            <dict-tag :options="always_flag" :value="scope.row.alwaysFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[16].visible"/>
-        <el-table-column label="创建组织" align="center" prop="createOrgId" v-if="columns[17].visible"/>
-        <el-table-column label="使用组织" align="center" prop="useOrgId" v-if="columns[18].visible"/>
-        <el-table-column label="所属产线" align="center" prop="prodLineId" v-if="columns[19].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[20].visible">
-          <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="删除标识" align="center" prop="deletedFlag" v-if="columns[21].visible">
-          <template #default="scope">
-            <dict-tag :options="deleted_flag" :value="scope.row.deletedFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="采购计价单位" align="center" prop="purchasePriceUnitId" v-if="columns[22].visible"/>
-        <el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[23].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="erp最后更新日期" align="center" prop="erpModifyDate" width="180" v-if="columns[24].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="最大库存数量" align="center" prop="maxStockAmount" v-if="columns[25].visible"/>
-        <el-table-column label="最小库存数量" align="center" prop="minStockAmount" v-if="columns[26].visible"/>
-        <el-table-column label="安全库存数量" align="center" prop="safeStockAmount" v-if="columns[27].visible"/>
-        <el-table-column label="申请标识" align="center" prop="applyFlag" v-if="columns[28].visible">
-          <template #default="scope">
-            <dict-tag :options="apply_flag" :value="scope.row.applyFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="物料分类" align="center" prop="materialClassfication" v-if="columns[29].visible">
-          <template #default="scope">
-            <dict-tag :options="material_classfication" :value="scope.row.materialClassfication"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="自动出库标识" align="center" prop="autoOutstockFlag" v-if="columns[30].visible">
-          <template #default="scope">
-            <dict-tag :options="auto_outstock_flag" :value="scope.row.autoOutstockFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="辅料标识" align="center" prop="accessoriesFlag" v-if="columns[31].visible">
-          <template #default="scope">
-            <dict-tag :options="mes_accessories_flag" :value="scope.row.accessoriesFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="低值易耗品标识(1是 0否)" align="center" prop="lowValueConsumableFlag" v-if="columns[32].visible">
-          <template #default="scope">
-            <dict-tag :options="mes_low_value_consumable_flag" :value="scope.row.lowValueConsumableFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="品牌" align="center" prop="brand" v-if="columns[33].visible"/>
-        <el-table-column label="层级" align="center" prop="plyrating" v-if="columns[34].visible"/>
-        <el-table-column label="花纹" align="center" prop="pattern" v-if="columns[35].visible"/>
-        <el-table-column label="速度级别" align="center" prop="speedLevel" v-if="columns[36].visible"/>
-        <el-table-column label="负荷载重" align="center" prop="load" v-if="columns[37].visible"/>
-        <el-table-column label="轮胎标记" align="center" prop="tireMarkings" v-if="columns[38].visible">
-          <template #default="scope">
-            <dict-tag :options="tire_markings" :value="scope.row.tireMarkings"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[39].visible"/>
-        <el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[40].visible"/>
-        <el-table-column label="标准重量" align="center" prop="standardWeight" v-if="columns[41].visible"/>
-        <el-table-column label="标准重量上限" align="center" prop="weightUpperLimit" v-if="columns[42].visible"/>
-        <el-table-column label="标准重量下限" align="center" prop="weightLowerLimit" v-if="columns[43].visible"/>
-        <el-table-column label="内胎标记" align="center" prop="innerTubeFlag" v-if="columns[44].visible">
-          <template #default="scope">
-            <dict-tag :options="inner_tube_flag" :value="scope.row.innerTubeFlag"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="销售类型" align="center" prop="saleType" v-if="columns[45].visible">
-          <template #default="scope">
-            <dict-tag :options="sale_type" :value="scope.row.saleType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[46].visible"/>
-        <!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[49].visible"/>
-                <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[50].visible"/>
-                <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[51].visible">
-                  <template #default="scope">
-                    <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[52].visible"/>
-                <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[53].visible">
-                  <template #default="scope">
-                    <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-                  </template>
-                </el-table-column>-->
+      </el-table-column>
+<!--      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>-->
+<!--      <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">-->
+<!--        <template #default="scope">-->
+<!--          <dict-tag :options="mes_batch_flag" :value="scope.row.batchFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="小批次数量" align="center" prop="batchAmount" v-if="columns[8].visible"/>-->
+<!--      <el-table-column label="计量单位ID" align="center" prop="materialUnitId" v-if="columns[9].visible"/>-->
+      <el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[6].visible" width="120"/>
+<!--      <el-table-column label="物料组" align="center" prop="materialMatkl" v-if="columns[11].visible"/>-->
+      <el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[7].visible"/>
+<!--      <el-table-column label="净重" align="center" prop="netWeight" v-if="columns[13].visible"/>
+      <el-table-column label="毛重" align="center" prop="grossWeight" v-if="columns[14].visible"/>
+      <el-table-column label="绑定标识" align="center" prop="alwaysFlag" v-if="columns[15].visible">
+        <template #default="scope">
+          <dict-tag :options="always_flag" :value="scope.row.alwaysFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[16].visible"/>
+      <el-table-column label="创建组织" align="center" prop="createOrgId" v-if="columns[17].visible"/>
+      <el-table-column label="使用组织" align="center" prop="useOrgId" v-if="columns[18].visible"/>
+      <el-table-column label="所属产线" align="center" prop="prodLineId" v-if="columns[19].visible"/>
+      <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[20].visible">
+        <template #default="scope">
+          <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标识" align="center" prop="deletedFlag" v-if="columns[21].visible">
+        <template #default="scope">
+          <dict-tag :options="deleted_flag" :value="scope.row.deletedFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="采购计价单位" align="center" prop="purchasePriceUnitId" v-if="columns[22].visible"/>
+      <el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[23].visible">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="erp最后更新日期" align="center" prop="erpModifyDate" width="180" v-if="columns[24].visible">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最大库存数量" align="center" prop="maxStockAmount" v-if="columns[25].visible"/>
+      <el-table-column label="最小库存数量" align="center" prop="minStockAmount" v-if="columns[26].visible"/>
+      <el-table-column label="安全库存数量" align="center" prop="safeStockAmount" v-if="columns[27].visible"/>
+      <el-table-column label="申请标识" align="center" prop="applyFlag" v-if="columns[28].visible">
+        <template #default="scope">
+          <dict-tag :options="apply_flag" :value="scope.row.applyFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料分类" align="center" prop="materialClassfication" v-if="columns[29].visible">
+        <template #default="scope">
+          <dict-tag :options="material_classfication" :value="scope.row.materialClassfication"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="自动出库标识" align="center" prop="autoOutstockFlag" v-if="columns[30].visible">
+        <template #default="scope">
+          <dict-tag :options="auto_outstock_flag" :value="scope.row.autoOutstockFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="辅料标识" align="center" prop="accessoriesFlag" v-if="columns[31].visible">
+        <template #default="scope">
+          <dict-tag :options="mes_accessories_flag" :value="scope.row.accessoriesFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="低值易耗品标识(1是 0否)" align="center" prop="lowValueConsumableFlag" v-if="columns[32].visible">
+        <template #default="scope">
+          <dict-tag :options="mes_low_value_consumable_flag" :value="scope.row.lowValueConsumableFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="品牌" align="center" prop="brand" v-if="columns[33].visible"/>
+      <el-table-column label="层级" align="center" prop="plyrating" v-if="columns[34].visible"/>
+      <el-table-column label="花纹" align="center" prop="pattern" v-if="columns[35].visible"/>
+      <el-table-column label="速度级别" align="center" prop="speedLevel" v-if="columns[36].visible"/>
+      <el-table-column label="负荷载重" align="center" prop="load" v-if="columns[37].visible"/>
+      <el-table-column label="轮胎标记" align="center" prop="tireMarkings" v-if="columns[38].visible">
+        <template #default="scope">
+          <dict-tag :options="tire_markings" :value="scope.row.tireMarkings"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[39].visible"/>
+      <el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[40].visible"/>
+      <el-table-column label="标准重量" align="center" prop="standardWeight" v-if="columns[41].visible"/>
+      <el-table-column label="标准重量上限" align="center" prop="weightUpperLimit" v-if="columns[42].visible"/>
+      <el-table-column label="标准重量下限" align="center" prop="weightLowerLimit" v-if="columns[43].visible"/>
+      <el-table-column label="内胎标记" align="center" prop="innerTubeFlag" v-if="columns[44].visible">
+        <template #default="scope">
+          <dict-tag :options="inner_tube_flag" :value="scope.row.innerTubeFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="销售类型" align="center" prop="saleType" v-if="columns[45].visible">
+        <template #default="scope">
+          <dict-tag :options="sale_type" :value="scope.row.saleType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[46].visible"/>-->
+      <!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[49].visible"/>
+              <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[50].visible"/>
+              <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[51].visible">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[52].visible"/>
+              <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[53].visible">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                </template>
+              </el-table-column>-->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -212,52 +208,8 @@ const columns = ref<FieldOption[]>([
   { key: 3, label: `物料名称`, visible: true },
   { key: 4, label: `物料类型ID`, visible: false },
   { key: 5, label: `物料大类`, visible: true },
-  { key: 6, label: `物料小类`, visible: false },
-  { key: 7, label: `批次标识`, visible: false },
-  { key: 8, label: `小批次数量`, visible: false },
-  { key: 9, label: `计量单位ID`, visible: false },
-  { key: 10, label: `计量单位名称`, visible: true },
-  { key: 11, label: `物料组`, visible: false },
-  { key: 12, label: `物料规格`, visible: true },
-  { key: 13, label: `净重`, visible: false },
-  { key: 14, label: `毛重`, visible: false },
-  { key: 15, label: `绑定标识`, visible: false },
-  { key: 16, label: `所属工厂`, visible: false },
-  { key: 17, label: `创建组织`, visible: false },
-  { key: 18, label: `使用组织`, visible: false },
-  { key: 19, label: `所属产线`, visible: false },
-  { key: 20, label: `激活标识`, visible: false },
-  { key: 21, label: `删除标识`, visible: false },
-  { key: 22, label: `采购计价单位`, visible: false },
-  { key: 23, label: `审核日期`, visible: false },
-  { key: 24, label: `erp最后更新日期`, visible: false },
-  { key: 25, label: `最大库存数量`, visible: false },
-  { key: 26, label: `最小库存数量`, visible: false },
-  { key: 27, label: `安全库存数量`, visible: false },
-  { key: 28, label: `申请标识`, visible: false },
-  { key: 29, label: `物料分类`, visible: false },
-  { key: 30, label: `自动出库标识`, visible: false },
-  { key: 31, label: `辅料标识`, visible: false },
-  { key: 32, label: `低值易耗品标识`, visible: false },
-  { key: 33, label: `品牌`, visible: false },
-  { key: 34, label: `层级`, visible: false },
-  { key: 35, label: `花纹`, visible: false },
-  { key: 36, label: `速度级别`, visible: false },
-  { key: 37, label: `负荷载重`, visible: false },
-  { key: 38, label: `轮胎标记`, visible: false },
-  { key: 39, label: `最小停放时间`, visible: false },
-  { key: 40, label: `最大停放时间`, visible: false },
-  { key: 41, label: `标准重量`, visible: false },
-  { key: 42, label: `标准重量上限`, visible: false },
-  { key: 43, label: `标准重量下限`, visible: false },
-  { key: 44, label: `内胎标记`, visible: false },
-  { key: 45, label: `销售类型`, visible: false },
-  { key: 46, label: `备注`, visible: false },
-  /*        { key: 49, label: `创建部门`, visible: true },
-          { key: 50, label: `创建人`, visible: true },
-          { key: 51, label: `创建时间`, visible: true },
-          { key: 52, label: `更新人`, visible: true },
-          { key: 53, label: `更新时间`, visible: true },*/
+  { key: 6, label: `计量单位名称`, visible: true },
+  { key: 7, label: `物料规格`, visible: true },
 ]);
 
 const initFormData: BaseMaterialInfoForm = {
@@ -310,6 +262,10 @@ const initFormData: BaseMaterialInfoForm = {
   innerTubeFlag: undefined,
   saleType: undefined,
   remark: undefined,
+
+  isHighValue: undefined,
+  inspectionRequest: undefined,
+
 }
 const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
   form: {...initFormData},
@@ -363,6 +319,11 @@ const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
     weightLowerLimit: undefined,
     innerTubeFlag: undefined,
     saleType: undefined,
+
+    isHighValue: undefined,
+    inspectionRequest: undefined,
+
+
     params: {
       approveDate: undefined,
     }