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 81c3ea3..c248367 100644
--- a/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
+++ b/src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
@@ -156,10 +156,10 @@ public class MesServiceImpl implements IMesService {
             receiptDetail.setInventorySts("good");
             receiptDetail.setCreatedBy("MOM");
             //判断是否为必须入库平库物料
-            if (judgeIsFlatWarehouse(material)) {
-                receiptDetail.setIsMustFlatWarehouseMaterial(true);
-            } else {
+            if (material == null || !judgeIsFlatWarehouse(material)) {
                 receiptDetail.setIsMustFlatWarehouseMaterial(false);
+            } else {
+                receiptDetail.setIsMustFlatWarehouseMaterial(true);
             }
             shipemtnDetailList.add(receiptDetail);
         }
@@ -180,6 +180,9 @@ public class MesServiceImpl implements IMesService {
     private boolean judgeIsFlatWarehouse(Material material) {
         String cinvccode = material.getCinvccode();
         String defWareHouse = material.getDefWareHouse();
+        if (cinvccode == null || defWareHouse == null) {
+            return false;
+        }
         List<FlatWarehouseMaterial> list = flatWarehouseMaterialService.list(new LambdaQueryWrapper<FlatWarehouseMaterial>()
                 .eq(FlatWarehouseMaterial::getWarehouseCode, defWareHouse)
                 .eq(FlatWarehouseMaterial::getClassificationCode, cinvccode));