From df2584585a9545afa11b731708e3b28570666423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 27 Apr 2021 17:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AbnormalBillServiceImpl.java    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 9b1d48c3..07a45882 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -964,7 +964,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         //根据车间找到对应车间的描述
         WorkCenter workCenter = workCenterMapper.findWorkCenterDescriptionByWorkCenter(site, abnormalBill.getWorkCenter(), locale);
         //根据资源找到对应的产线的描述
-        WorkCenter line = workCenterMapper.findWorkCenterDescriptionByResrce(HandleEnum.RESOURCE.getHandle(site, abnormalBill.getResrce()), locale);
+        WorkCenter line = null;
+        if(StringUtil.isBlank(abnormalBill.getResrce())){
+            line = workCenterMapper.findWorkCenterDescriptionByResrce(HandleEnum.RESOURCE.getHandle(site, abnormalBill.getResrce()), locale);
+        }
+
         //项目号
         ShopOrderDto projectNo = shopOrderMapper.findByShopOrderBo(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBill.getShopOrder()));
         //物料
@@ -973,16 +977,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(_item != null){
             item = _item.getItem() + "/" + _item.getDescription();
         }
-        if(workCenter != null){
+        if(workCenter != null && !StringUtil.isBlank(workCenter.getDescription())){
             messageMap.put("WORKCENTER",workCenter.getDescription());
         }
-        if(line != null){
+        if(line != null && !StringUtil.isBlank(line.getDescription())){
             messageMap.put("WORKCENTER_LIN",line.getDescription());
         }
-        if(projectNo != null){
+        if(projectNo != null && !StringUtil.isBlank(projectNo.getItemNumber())){
             messageMap.put("PROJECT",projectNo.getItemNumber());
         }
-        messageMap.put("SHOPORDER",abnormalBill.getWorkCenter());
+        if(!StringUtil.isBlank(abnormalBill.getWorkCenter())){
+            messageMap.put("SHOPORDER",abnormalBill.getWorkCenter());
+        }
         messageMap.put("ITEM",item);
         //格式化之后的消息
         return StringUtils.format(body, messageMap);