库位管理-增加绑定物料名称

(cherry picked from commit 710c911f4fde39b99ea6d24a079077bfe6d5fd25)

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

@@ -168,8 +168,10 @@
       <el-table-column label="列序号" align="center" prop="colIndex" />
       <el-table-column label="层号" align="center" prop="shiftNo" />
       <el-table-column label="层序号" align="center" prop="shiftIndex" />
-      <el-table-column label="限高" align="center" prop="heightLimit" />
-      <el-table-column label="限重" align="center" prop="weightLimit" />
+      <el-table-column label="物料种类" align="center" prop="bindSku" />
+      <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">
         <template slot-scope="scope">
           <el-button
@@ -288,7 +290,7 @@
           <el-input :disabled="form.foldedTag === '0'" v-model="form.foldedCount" placeholder="请输入堆叠层数" />
         </el-form-item>
         <el-form-item label="绑定物料" prop="bindSku">
-          <el-select style="width: 100%" v-model="form.bindSku" :multiple="true" placeholder="请选择物料种类" clearable size="small">
+          <el-select style="width: 100%" v-model="form.bindSku"  placeholder="请选择物料种类" clearable size="small">
             <el-option
               v-for="dict in skuTypeCombo"
               :key="dict.itemCode"
@@ -297,12 +299,15 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="限高" prop="heightLimit">
-          <el-input v-model="form.heightLimit" placeholder="请输入限高" />
-        </el-form-item>
-        <el-form-item label="限重" prop="weightLimit">
-          <el-input v-model="form.weightLimit" 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="请输入限高" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="限重" prop="weightLimit">-->
+<!--          <el-input v-model="form.weightLimit" placeholder="请输入限重" />-->
+<!--        </el-form-item>-->
         <!--<el-form-item label="条形码" prop="locationBarcode">
           <el-input v-model="form.locationBarcode" placeholder="请输入条形码" />
         </el-form-item>

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

@@ -145,7 +145,7 @@ public class BaseLocationInfo extends BaseEntity {
     private String userdefine8;
 
     private String userdefine9;
-
+    @Excel(name = "物料名称")
     private String userdefine10;
 
     private String orderByClause;