diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java index d14e9d2..4ed2fe6 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java @@ -385,19 +385,19 @@ public class InventoryService extends ServiceImpl { cell.setCellValue(createHelper.createRichTextString(String.valueOf(a++))); cell = row.createCell(1); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getStorehouse_name()==null?"":inventories.get(j).getStorehouse_name().toString())); + .getStorehouse_name()==null?"":inventories.get(j).getStorehouse_name())); cell = row.createCell(2); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_group_text()==null?"":inventories.get(j).getMateriel_group_text().toString())); + .getMateriel_group_text()==null?"":inventories.get(j).getMateriel_group_text())); cell = row.createCell(3); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_no()==null?"":inventories.get(j).getMateriel_no().toString())); + .getMateriel_no()==null?"":inventories.get(j).getMateriel_no())); cell = row.createCell(4); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_name()==null?"":inventories.get(j).getMateriel_name().toString())); + .getMateriel_name()==null?"":inventories.get(j).getMateriel_name())); cell = row.createCell(5); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getBrand_name() == null?"":inventories.get(j).getBrand_name().toString())); + .getBrand_name() == null?"":inventories.get(j).getBrand_name())); cell = row.createCell(6); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) .getPrice()==null?"":inventories.get(j).getPrice().toString())); diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java index 4b75d9c..6790843 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/outstock/OutStockService.java @@ -89,7 +89,7 @@ public class OutStockService extends ServiceImpl { /** * @Description //描述: 出入库记录导出 - * @Param [map1, state] state 0出库 1入库 + * @Param [map1, state] state 0入库 1出库 * @return void **/ public void exportExcel(Map> map1,int state) throws Exception{