diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java index dd5ed1aa..f5731b65 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectWorktrayrealtimeinfoController.java @@ -66,7 +66,11 @@ public class SelectWorktrayrealtimeinfoController extends BaseController { List list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo); for (TRpWorktrayrealtimeinfo tw:list) { - tw.setProductCode(tw.getBarcoderelationship().getProductBarcode()); + if(tw.getBarcoderelationship()!=null){ + if (tw.getBarcoderelationship().getProductBarcode()!=null){ + tw.setProductCode(tw.getBarcoderelationship().getProductBarcode()); + } + } } ExcelUtil util = new ExcelUtil(TRpWorktrayrealtimeinfo.class); return util.exportExcel(list, "托盘实时信息"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java index acbf7af0..a7c7fa57 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java @@ -32,7 +32,7 @@ public class TRpWorktrayrealtimeinfo extends BaseEntity private String currentStation; /** 质量品级 */ - @Excel(name = "质量品级(1合格,2不合格)") +// @Excel(name = "质量品级(1合格,2不合格)") private Long state; /** 使用状态 */