库位管理-库位导入

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

@@ -170,6 +170,7 @@
       <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="foldedTag" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -272,31 +273,34 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="盘架编号" prop="rackId">
-          <el-input v-model="form.rackId" placeholder="请输入盘架编号" />
-        </el-form-item>
+<!--        <el-form-item label="盘架编号" prop="rackId">-->
+<!--          <el-input v-model="form.rackId" placeholder="请输入盘架编号" />-->
+<!--        </el-form-item>-->
         <el-form-item label="AGV点位" prop="agvStation">
           <el-input v-model="form.agvStation" placeholder="请输入AGV点位" />
         </el-form-item>
-        <el-form-item label="是否堆叠" prop="foldedTag">
-          <el-select v-model="form.foldedTag" placeholder="请选择是否堆叠" style="width: 100%">
-            <el-option label="非堆叠" value="0"></el-option>
-            <el-option label="堆叠" value="1"></el-option>
-          </el-select>
-        </el-form-item>
-        <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-select style="width: 100%" v-model="form.bindSku" :multiple="true" placeholder="请选择物料种类" clearable size="small">
-            <el-option
-              v-for="dict in skuTypeCombo"
-              :key="dict.itemCode"
-              :label="dict.itemName"
-              :value="dict.itemCode"
-            />
-          </el-select>
-        </el-form-item>
+        <el-form-item label="车号" prop="foldedTag">
+          <el-input v-model="form.foldedTag" placeholder="请输入车号" />
+         </el-form-item>
+<!--        <el-form-item label="是否堆叠" prop="foldedTag">-->
+<!--          <el-select v-model="form.foldedTag" placeholder="请选择是否堆叠" style="width: 100%">-->
+<!--            <el-option label="非堆叠" value="0"></el-option>-->
+<!--            <el-option label="堆叠" value="1"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <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-select style="width: 100%" v-model="form.bindSku" :multiple="true" placeholder="请选择物料种类" clearable size="small">-->
+<!--            <el-option-->
+<!--              v-for="dict in skuTypeCombo"-->
+<!--              :key="dict.itemCode"-->
+<!--              :label="dict.itemName"-->
+<!--              :value="dict.itemCode"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="限高" prop="heightLimit">
           <el-input v-model="form.heightLimit" placeholder="请输入限高" />
         </el-form-item>

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

@@ -94,7 +94,7 @@ public class BaseLocationInfo extends BaseEntity {
     /**
      * 指定产品
      */
-    @Excel(name = "指定产品")
+//    @Excel(name = "指定产品")
     private String bindSku;
 
     /**
@@ -115,8 +115,9 @@ public class BaseLocationInfo extends BaseEntity {
     private Long agvStation;
 
     /**
-     * 0默认(没有任何含义),1允许堆叠
+     * 车号（标识这个库位是几号车做任务）
      */
+    @Excel(name = "车号(输入1或者2)")
     private String foldedTag;
 
     /**

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationInfoServiceImpl.java

@@ -363,6 +363,7 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService {
                 if (StringUtils.isEmpty(baseLocationInfo.getLocationNo())) {
                     baseLocationInfo.setLocationNo(baseLocationInfo.getRowNo() + "-" + StringUtils.addZero(baseLocationInfo.getColNo(), 2) + "-" + StringUtils.addZero(baseLocationInfo.getShiftNo(), 2));
                 }
+                baseLocationInfo.setLocationNo(baseLocationInfo.getLocationNo().replaceAll("\t",""));
                 BaseLocationInfo b = baseLocationInfoMapper.selectBaseLocationInfoByLocationNo(baseLocationInfo.getLocationNo(), Constant.WAREHOUSE_ID);
                 if (b == null) {
                     //BeanValidators.validateWithException(validator, stu);