Browse Source

[fix]:修复物料信息导出报错

dev
youjianchi 9 months ago
parent
commit
c5d9190cce
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
  2. 17
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java

2
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java

@ -107,7 +107,7 @@ public class ErpMaterialController extends BaseController
@ResponseBody
public AjaxResult export(ErpMaterialVo erpMaterialVo)
{
List<ErpMaterialVo> list = erpMaterialService.selectErpMaterialList(erpMaterialVo);
List<ErpMaterialVo> list = erpMaterialMapper.selectErpMaterialList(erpMaterialVo);
ExcelUtil<ErpMaterialVo> util = new ExcelUtil<ErpMaterialVo>(ErpMaterialVo.class);
return util.exportExcel(list, "物料信息数据");
}

17
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java

@ -26,10 +26,10 @@ public class ErpMaterial extends BaseEntity
private String delFlag;
/** 料号 */
@Excel(name = "料号")
@Excel(name = "料号",sort = 1)
private String materialNo;
/** 物料名称 */
@Excel(name = "物料名称")
@Excel(name = "物料名称",sort = 3)
private String materialName;
/** 审核状态 0-待审核 1-审核通过 2-审核拒绝*/
@ -38,6 +38,7 @@ public class ErpMaterial extends BaseEntity
/** 使用状态 0-否 1-是 2-已作废*/
private String useStatus;
/** 关联bom */
@Excel(name = "关联bom号",sort = 2)
private String bomNo;
/** 是否有生产团队 */
private String havaProductTem;
@ -46,27 +47,27 @@ public class ErpMaterial extends BaseEntity
/**技术团队名称 */
private String itemName;
/** 物料类型 */
@Excel(name = "物料类型")
@Excel(name = "物料类型",sort = 4)
private String materialType;
/** 加工方式 */
@Excel(name = "加工方式")
@Excel(name = "加工方式",sort = 8,dictType = "processMethod")
private String processMethod;
/** 单位 */
@Excel(name = "单位")
@Excel(name = "单位",sort = 5)
private String unit;
/** 品牌 */
@Excel(name = "品牌")
@Excel(name = "品牌",sort = 6)
private String brand;
/** 描述 */
@Excel(name = "描述")
@Excel(name = "描述",sort = 7)
private String describe;
/** 入库部门 */
@Excel(name = "入库部门")
@Excel(name = "入库部门",sort = 9,dictType = "warehouseDept")
private String warehouseDept;
/** 流程实例ID */

Loading…
Cancel
Save