From 25aa7deaaa0655429f1b5807247ad68c48292356 Mon Sep 17 00:00:00 2001 From: Limy <1353020654@qq.com> Date: Mon, 8 Mar 2021 16:49:40 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=88=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanjing/SelectWorktrayrealtimeinfoController.java | 6 +++++- .../com/ruoyi/nanjing/domain/TRpWorktrayrealtimeinfo.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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; /** 使用状态 */