1、wms与wcs库位做一对一对应

2、库位视图排序

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

@@ -165,7 +165,10 @@
       <el-table-column label="排号" align="center" prop="rowNo" />
       <el-table-column label="排序号" align="center" prop="rowIndex" />
       <el-table-column label="列号" align="center" prop="colNo" />
-      <el-table-column label="列序号" align="center" prop="colIndex" />
+<!--      <el-table-column label="列序号" align="center" prop="colIndex" />-->
+      <el-table-column label="WCS-X" align="center" prop="rowIndex" />
+      <el-table-column label="WCX-Y" align="center" prop="rowNo" />
+      <el-table-column label="WCX-Z" align="center" prop="shiftNo" />
       <el-table-column label="层号" align="center" prop="shiftNo" />
       <el-table-column label="层序号" align="center" prop="shiftIndex" />
       <el-table-column label="限高" align="center" prop="heightLimit" />
@@ -233,8 +236,17 @@
         <el-form-item label="列号" prop="colNo">
           <el-input v-model="form.colNo" placeholder="请输入列号" />
         </el-form-item>
-        <el-form-item label="列序号" prop="colIndex">
-          <el-input v-model="form.colIndex" placeholder="请输入列序号" />
+<!--        <el-form-item label="列序号" prop="colIndex">-->
+<!--          <el-input v-model="form.colIndex" placeholder="请输入列序号" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="WCS-X" prop="rowIndex">
+          <el-input v-model="form.rowIndex" placeholder="请输入WCS-X" />
+        </el-form-item>
+        <el-form-item label="WCS-Y" prop="rowNo">
+          <el-input v-model="form.rowNo" placeholder="请输入WCS-Y" />
+        </el-form-item>
+        <el-form-item label="WCS-Z" prop="shiftNo">
+          <el-input v-model="form.shiftNo" placeholder="请输入WCS-Z" />
         </el-form-item>
         <el-form-item label="层号" prop="shiftNo">
           <el-input v-model="form.shiftNo" placeholder="请输入层号" />

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -597,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where t1.zone_id = #{zoneId}
         <choose>
             <when test=" sort == '1'.toString() ">
-                ORDER BY CONCAT(t1.row_no,t1.shift_no),t1.location_no
+                ORDER BY CONCAT(t1.row_no,t1.shift_no) + 0,t1.location_no
             </when >
             <when test=" sort == '2'.toString() ">
                 ORDER BY t1.col_no + 0,t1.location_no