From 8cb28c3fdac5e9ab419d709fb44f671300a1d724 Mon Sep 17 00:00:00 2001
From: songguoqiang <Song123456@>
Date: Mon, 6 Nov 2023 11:33:42 +0800
Subject: [PATCH] =?UTF-8?q?APP=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=A4=B4=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=BB=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E5=AD=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/wms/controller/labeltype/LabeltypeController.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java
index a526ff1f..f0707665 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java
@@ -139,6 +139,9 @@ public class LabeltypeController {
             LabeltypeDO labeltypeDO = labeltypeService.getOneLabelByHeader(LabeltypeRespVO);
             LabeltypeRespVO result = LabeltypeConvert.INSTANCE.convert(labeltypeDO);
             BarcodeExportReqVO barcodeExportReqVO = new BarcodeExportReqVO();
+            if(result==null) {
+                return success(result);
+            };
             barcodeExportReqVO.setMasterId(result.getId());
             List<BarcodeDO> barcodeList = barcodeService.getBarcodeList(barcodeExportReqVO);
             List<BarcodeExcelVO> datas = BarcodeConvert.INSTANCE.convertList02(barcodeList);