diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
index 89577a86..0be6268a 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
@@ -514,7 +514,8 @@ public class NormalPGIController extends BaseController {
             //同步箱码信息到物料码中
             List<WmsQrCodeMaster> parents = qrCodeMasters
                     .stream()
-                    .filter(qrCode -> qrCode.getPackagingType() == 1)
+//                    .filter(qrCode -> qrCode.getPackagingType() == 1)
+                    .filter(qrCode -> qrCode.getPackagingType() != null && qrCode.getPackagingType() == 1)
                     .toList();
             List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
                     .in(WmsQrCodeMaster::getParentBarcodeId, parents
@@ -523,6 +524,7 @@ public class NormalPGIController extends BaseController {
                             .toList()
                     )
                     .list();
+
             parents.forEach(p -> {
                 children.stream()
                         .filter(c -> c.getParentBarcodeId().equals(p.getId()))