diff --git a/web/src/main/java/com/leaper/web/pojo/stock/StockDirectionConvert.java b/web/src/main/java/com/leaper/web/pojo/stock/StockDirectionConvert.java
new file mode 100644
index 0000000..89b9115
--- /dev/null
+++ b/web/src/main/java/com/leaper/web/pojo/stock/StockDirectionConvert.java
@@ -0,0 +1,35 @@
+package com.leaper.web.pojo.stock;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class StockDirectionConvert implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return null;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(integer == 1){
+            return new CellData("左");
+        }else {
+            return new CellData("右");
+        }
+    }
+
+
+}
diff --git a/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java b/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java
index 903f2ee..d9ef380 100644
--- a/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java
+++ b/web/src/main/java/com/leaper/web/pojo/stock/StockExportExcel.java
@@ -20,10 +20,10 @@ public class StockExportExcel {
     @ExcelProperty(index = 6, value = "WMS条码")
     private String wmsCode;
 
-    @ExcelProperty(index = 1, value = "左右,1:左侧,2:右侧")
+    @ExcelProperty(index = 1, value = "左右",converter=StockDirectionConvert.class)
     private Integer direction;
 
-    @ExcelProperty(index = 2, value = "深浅,1:浅货位,2:深货位")
+    @ExcelProperty(index = 2, value = "深浅",converter = StockSideConvert.class)
     private Integer side;
 
 //    @ExcelProperty(index = 1, value = "货架号")
diff --git a/web/src/main/java/com/leaper/web/pojo/stock/StockSideConvert.java b/web/src/main/java/com/leaper/web/pojo/stock/StockSideConvert.java
new file mode 100644
index 0000000..7de4be9
--- /dev/null
+++ b/web/src/main/java/com/leaper/web/pojo/stock/StockSideConvert.java
@@ -0,0 +1,35 @@
+package com.leaper.web.pojo.stock;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class StockSideConvert implements Converter<Integer> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return null;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public Integer convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(integer == 1){
+            return new CellData("浅货位");
+        }else {
+            return new CellData("深货位");
+        }
+    }
+
+
+}
diff --git a/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java b/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java
index 3344c7b..c033d88 100644
--- a/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java
+++ b/web/src/main/java/com/leaper/web/pojo/stock/StockStatus.java
@@ -12,8 +12,8 @@ public enum StockStatus {
 
     SUCCESS(2, "盘点准确"),
 
-    ERROR(1, "核对错误"),
-    MANUAL(3,"人工核对")
+    ERROR(1, "盘点错误"),
+    MANUAL(3,"人工核对正确")
     ;
     private Integer status;
 
diff --git a/web/src/main/java/com/leaper/web/service/StockService.java b/web/src/main/java/com/leaper/web/service/StockService.java
index 46a78ea..696a35c 100644
--- a/web/src/main/java/com/leaper/web/service/StockService.java
+++ b/web/src/main/java/com/leaper/web/service/StockService.java
@@ -66,13 +66,13 @@ public class StockService {
             return new ArrayList<>();
         }
         //List<String> shelves = streetService.check(street);
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("street_id","`direction`","`side`","`row`", "`column`"));
         return stocks;
     }
 
     public PageInfo<Stock> page(PageSearch pageSearch) {
         PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("street_id","`direction`","`side`", "`row`", "`column`"));
         return new PageInfo<>(stocks);
 
     }