diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
index 0bff21b1b..9256eee40 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
@@ -2657,7 +2657,7 @@ public class StockShelfOrderApplicationService {
             String mtpckEndprdTypecd = "E";
             if (materialBaseInfoId != null) {
                 MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId);
-                if (materialBaseIn != null) {
+                if (materialBaseIn.getGoodsType() != null) {
                     Integer goodsType = materialBaseIn.getGoodsType();
                     if (goodsType == 0) {
                         mtpckEndprdTypecd = "M";
@@ -2665,6 +2665,8 @@ public class StockShelfOrderApplicationService {
                         mtpckEndprdTypecd = "E";
                     } else if (goodsType == 1) {
                         mtpckEndprdTypecd = "E";
+                    }else{
+                        throw new ServiceException("货物类型不存在");
                     }
                 }
             }