From 5fee80e8278d6474ab1d97932d22887974fe4806 Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Wed, 3 Jun 2026 17:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E7=B1=BB=E5=9E=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockShelfOrder/StockShelfOrderApplicationService.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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("货物类型不存在");
                     }
                 }
             }