diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml
index af7b3d06..8de4ac15 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml
@@ -65,8 +65,8 @@
         SELECT pc.*,di."name" AS "type_name"
         FROM wms_shipment_packaging_code pc
         LEFT JOIN dictionary_item di ON pc."type"=di."id"
-        INNER JOIN wms_shipment_delivery_item di ON di.packaging_code_id=pc."id"
-        INNER JOIN wms_shipment_delivery d ON di.delivery_id=d."id"
+        INNER JOIN wms_shipment_delivery_item sdi ON sdi.packaging_code_id=pc."id"
+        INNER JOIN wms_shipment_delivery d ON sdi.delivery_id=d."id"
         where pc.status=3 and d.no=#{code}
     </select>
 
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java
index c10e51e9..e70594e6 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java
@@ -161,6 +161,7 @@ public class H5Controller extends BaseController {
             return ApiResult.success(packagingCodeService.getForInstall(packagingCode.getId()));
         } else {
             ShipmentMaterialCodeQRVO vo = materialCodeItemQrService.getInfoByQRCode(code);
+            VUtil.trueThrowBusinessError(Objects.isNull(vo)).throwMessage("未找到该物料");
             VUtil.trueThrowBusinessError(vo.getStatus() == 5).throwMessage("该物料已安装");
             return ApiResult.success(List.of(vo));
         }