From 1669051e61041fc8947386fbf6ae26a4d6f8294e Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Thu, 21 Apr 2022 16:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zzjee/wm/controller/WmImNoticeHController.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
index bab341a0..8e7bbc7b 100644
--- a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
@@ -1393,7 +1393,19 @@ public class WmImNoticeHController extends BaseController {
                 cellHead6.setCellStyle(cs2);
 
                 Cell cellHead62 = rowHead6.createCell(3);
-                cellHead62.setCellValue("供应商/车号： "+wmImNoticeH.getImCarNo() );
+                String gys="";
+                if(!StringUtil.isEmpty(wmImNoticeH.getSupCode())){
+                    gys = wmImNoticeH.getSupCode()+wmImNoticeH.getSupName();
+                }
+                if(!StringUtil.isEmpty(wmImNoticeH.getImCarNo())){
+                    if(!StringUtil.isEmpty(gys)){
+                        gys = wmImNoticeH.getSupCode();
+                    }else{
+                        gys =gys+"/"+ wmImNoticeH.getSupCode();
+                    }
+
+                }
+                cellHead62.setCellValue("供应商/车号： "+  gys );
                 cellHead62.setCellStyle(cs2);
 
                 Row rowHead7 = sheet.createRow((short) page*20+7); // 头部第二行