diff --git a/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java b/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
index 91f6798..9f7b446 100644
--- a/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
+++ b/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
@@ -188,7 +188,7 @@ public class MesServiceImpl implements IMesService {
             receiptDetail.setProductionWorker(receiptHeader.getProductionWorker());
             receiptDetail.setProductionWorkerName(receiptHeader.getProductionWorkerName());
             receiptDetail.setPaintStatus(receiptHeader.getPaintStatus());
-
+            receiptDetail.setMaterialColor(receiptHeader.getMaterialColor());
 
             //判断是否为必须入库平库物料，通知单号带“展会”两个字的物料也必须入平库
             if (material == null || !judgeIsFlatWarehouse(material, receiptDetail.getNoticeNo())) {
diff --git a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
index ae66911..2182a2a 100644
--- a/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
+++ b/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
@@ -132,7 +132,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 }
             }
             if (bigContainerLocations.isEmpty()) {
-                return null;
+                return "可能是大托盘库位不够用了";
             }
             if (entry && bigContainerLocations.size() <= 4) {//留4个大托盘库位移库用
                 return "可能是大托盘库位不够用了";