diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
index 358261f..6438241 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
@@ -1,6 +1,7 @@
 package com.huaheng.pc.shipment.shipmentHeader.domain;
 
 import com.huaheng.common.utils.DataUtils;
+import com.huaheng.common.utils.StringUtils;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
@@ -69,7 +70,7 @@ public class ShipmentPrintVo {
         voDetail.recordCode = taskDetail.getRecordCode();//合并前单号
         voDetail.port = port;//出库口
         String materialColor = taskDetail.getMaterialColor();
-        if (materialColor.length() > 12) {
+        if (StringUtils.isNotEmpty(materialColor) && materialColor.length() > 12) {
             data.materialColor = materialColor.substring(12);
         } else {
             data.materialColor = materialColor;