From f10eba767c09d40ea890d0cf82698a9e855d55b1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 14:07:52 +0800
Subject: [PATCH] #v2.1

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 0cd69e5..80dcce2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -152,6 +152,9 @@
         List<BarcodeDataVo> list = new ArrayList<>();
         for (Slave barcode : slaveProperties.getBarcode()) {
             BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
+            if (null == barcodeThread) {
+                continue;
+            }
             BarcodeDataVo vo = new BarcodeDataVo();
             vo.setBarcodeId(barcode.getId());
             vo.setCodeValue(barcodeThread.getBarcode());

--
Gitblit v1.9.1