库位管理-增加绑定物料号

(cherry picked from commit ece51fb0ac1915dfd082ddb8c1dc94f87da35f96)

ruoyi-ui/src/views/base/locationInfo/index.vue

@@ -169,7 +169,7 @@
       <el-table-column label="层号" align="center" prop="shiftNo" />
       <el-table-column label="层序号" align="center" prop="shiftIndex" />
       <el-table-column label="物料种类" align="center" prop="bindSku" />
-      <el-table-column label="物料名称" align="center" prop="userdefine10" />
+      <el-table-column label="物料编号" align="center" prop="userdefine10" />
 <!--      <el-table-column label="限高" align="center" prop="heightLimit" />-->
 <!--      <el-table-column label="限重" align="center" prop="weightLimit" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -289,7 +289,7 @@
         <el-form-item label="堆叠层数" prop="foldedCount">
           <el-input :disabled="form.foldedTag === '0'" v-model="form.foldedCount" placeholder="请输入堆叠层数" />
         </el-form-item>
-        <el-form-item label="绑定物料" prop="bindSku">
+        <el-form-item label="绑定物料种类" prop="bindSku">
           <el-select style="width: 100%" v-model="form.bindSku"  placeholder="请选择物料种类" clearable size="small">
             <el-option
               v-for="dict in skuTypeCombo"
@@ -299,8 +299,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="物料名称" prop="userdefine10">
-          <el-input v-model="form.userdefine10" placeholder="请输入物料名称" />
+        <el-form-item label="绑定物料编号" prop="userdefine10">
+          <el-input v-model="form.userdefine10" placeholder="请输入物料编号" />
         </el-form-item>
 <!--        <el-form-item label="限高" prop="heightLimit">-->
 <!--          <el-input v-model="form.heightLimit" placeholder="请输入限高" />-->

ruoyi-ui/src/views/base/skuType/index.vue

@@ -47,6 +47,7 @@
       default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
+      <el-table-column label="id"  prop="itemCode" />
       <el-table-column label="种类名称" prop="itemName"></el-table-column>
       <!--<el-table-column label="父id" align="center" prop="parentCode" />-->
       <el-table-column label="启用状态" align="center" prop="status">

warewms-base/src/main/java/com/ruoyi/base/domain/BaseLocationInfo.java

@@ -94,7 +94,7 @@ public class BaseLocationInfo extends BaseEntity {
     /**
      * 指定产品
      */
-    @Excel(name = "指定产品")
+    @Excel(name = "绑定物料类型（id）")
     private String bindSku;
 
     /**
@@ -145,7 +145,7 @@ public class BaseLocationInfo extends BaseEntity {
     private String userdefine8;
 
     private String userdefine9;
-    @Excel(name = "物料名称")
+    @Excel(name = "绑定物料编号")
     private String userdefine10;
 
     private String orderByClause;