diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
index c559b23ed..11caf9976 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
@@ -613,7 +613,8 @@ public class StockInOrderDomainService {
                 }
                 int index=0;
                 for (Map<String, Object> stringObjectMap : shelfList) {
-                    BigDecimal shelvesQuantity = (BigDecimal) stringObjectMap.get("shelvesQuantity");
+                    Object shelvesQuantityObj = stringObjectMap.get("shelvesQuantity");
+                    BigDecimal shelvesQuantity = shelvesQuantityObj != null ? new BigDecimal(String.valueOf(shelvesQuantityObj)) : null;
                     String shelfOrderNumber = (String) stringObjectMap.get("shelfOrderNumber");
                     String warehouseCode = (String) stringObjectMap.get("warehouseCode");
                     String warehouseName = (String) stringObjectMap.get("warehouseName");
@@ -621,9 +622,12 @@ public class StockInOrderDomainService {
                     String storageName = (String) stringObjectMap.get("storageName");
                     String storageLocationCode = (String) stringObjectMap.get("storageLocationCode");
                     String storageLocationName = (String) stringObjectMap.get("storageLocationName");
-                    Long warehouseId = (Long) stringObjectMap.get("warehouseId");
-                    Long storageSectionId = (Long) stringObjectMap.get("storageSectionId");
-                    Long storageLocationId = (Long) stringObjectMap.get("storageLocationId");
+                    Object warehouseIdObj = stringObjectMap.get("warehouseId");
+                    Long warehouseId = warehouseIdObj != null ? Long.valueOf(String.valueOf(warehouseIdObj)) : null;
+                    Object storageSectionIdObj = stringObjectMap.get("storageSectionId");
+                    Long storageSectionId = storageSectionIdObj != null ? Long.valueOf(String.valueOf(storageSectionIdObj)) : null;
+                    Object storageLocationIdObj = stringObjectMap.get("storageLocationId");
+                    Long storageLocationId = storageLocationIdObj != null ? Long.valueOf(String.valueOf(storageLocationIdObj)) : null;
 //                    Integer level = (Integer) stringObjectMap.get("level");
 
                     // 如果 materialDetailId 不为空，则更新上架单明细