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 a815bea3b..0a628c5be 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
@@ -568,19 +568,18 @@ public class StockInOrderDomainService {
             inMaterialDetailDO.setWeightLimit(packDetailFeignPO.getWeight());
             inMaterialDetailDO.setVolumeLimit(packDetailFeignPO.getVolume());
 
-            //获取仓库控制信息
+            // 仓库控制信息：有则回填，无则不校验（允许未维护物料-仓库控制时编辑入库单）
             MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId());
-            if (materialWarehouseControlPO == null){
-                throw new ServiceException("物料仓库控制信息不存在");
+            if (materialWarehouseControlPO != null) {
+                inMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId());
+                inMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage());
+                inMaterialDetailDO.setQualityInspectionManage(materialWarehouseControlPO.getQualityInspectionManage());
+                inMaterialDetailDO.setQualityInspectionStage(materialWarehouseControlPO.getQualityInspectionStage());
+                inMaterialDetailDO.setQualityInspectionRule(materialWarehouseControlPO.getQualityInspectionRule());
+                inMaterialDetailDO.setQualityInspectionTerm(materialWarehouseControlPO.getQualityInspectionTerm());
+                inMaterialDetailDO.setAllowOvercharge(materialWarehouseControlPO.getAllowOvercharge());
+                inMaterialDetailDO.setOverchargeRatio(materialWarehouseControlPO.getOverchargeRatio());
             }
-            inMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId());
-            inMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage());
-            inMaterialDetailDO.setQualityInspectionManage(materialWarehouseControlPO.getQualityInspectionManage());
-            inMaterialDetailDO.setQualityInspectionStage(materialWarehouseControlPO.getQualityInspectionStage());
-            inMaterialDetailDO.setQualityInspectionRule(materialWarehouseControlPO.getQualityInspectionRule());
-            inMaterialDetailDO.setQualityInspectionTerm(materialWarehouseControlPO.getQualityInspectionTerm());
-            inMaterialDetailDO.setAllowOvercharge(materialWarehouseControlPO.getAllowOvercharge());
-            inMaterialDetailDO.setOverchargeRatio(materialWarehouseControlPO.getOverchargeRatio());
 
             //获取商品规则信息
             MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId());