小改

klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java

@@ -29,7 +29,6 @@ public class WmsStockVo {
     /**
      * 仓库/库区/库位ID
      */
-    @ExcelProperty(value = "仓库/库区/库位ID")
     private Long warehouseId;
 
     /**
@@ -55,23 +54,11 @@ public class WmsStockVo {
      */
     private String itemCode;
 
-    /**
-     * 库存数量
-     */
-    @ExcelProperty(value = "库存数量")
-    private BigDecimal quantity;
-
-    /**
-     * 单位
-     */
-    @ExcelProperty(value = "单位")
-    private String unit;
-
     /**
      * 批次号（可选）
      */
     @ExcelProperty(value = "批次号", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "可=选")
+    @ExcelDictFormat(readConverterExp = "可选")
     private String batchNo;
 
     /**
@@ -92,4 +79,15 @@ public class WmsStockVo {
     @ExcelProperty(value = "在途量")
     private BigDecimal onTheWay;
 
+    /**
+     * 总量（通过item_type和item_id查询对应的钢卷总量）
+     */
+    @ExcelProperty(value = "总量")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 库存分布列表（按仓库统计）
+     */
+    private java.util.List<WmsStockVo> stockDistribution;
+
 }