查询逻辑 联查name和code

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

@@ -36,16 +36,25 @@ public class WmsStockVo {
      * 物品类型（raw_material/product）
      */
     @ExcelProperty(value = "物品类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "r=aw_material/product")
+    @ExcelDictFormat(readConverterExp = "raw_material/product")
     private String itemType;
 
     /**
      * 物品ID（指向原材料或产品主键）
      */
     @ExcelProperty(value = "物品ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "指=向原材料或产品主键")
+    @ExcelDictFormat(readConverterExp = "指向原材料或产品主键")
     private Long itemId;
 
+    /**
+     * 物品名称（动态：产品或原材料）
+     */
+    private String itemName;
+    /**
+     * 物品编码（动态：产品或原材料）
+     */
+    private String itemCode;
+
     /**
      * 库存数量
      */