diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
index 7809351..24d0fa2 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
@@ -117,6 +117,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     @Autowired
     private MesShippingQueueRepository shippingQueueRDao;
 
+    @Autowired
+    private IMesConfigService mesConfigService;
+
     @Override
     public MesSortShippingCheckModel doShippingOrderNoQuery(MesShippingOrderManagement shippingOrderManagement) {
         //校验发运单
@@ -773,6 +776,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         if (StringUtil.isEmpty(detail.getVin())) {
             MesPcnException.throwMesBusiException("发运单【%s】零件号【%s】vin号为空，请检查数据", orderManagement.getShippingCode(), detail.getPartNo());
         }
+        MesConfig config = mesConfigService.getCfgValueByCode(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG);
+        if (config == null || StringUtils.isEmpty(config.getCfgValue()) || !config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) {
+            return;
+        }
 
         MesShippingQueue mesShippingQueue = new MesShippingQueue();
         mesShippingQueue.setOrganizeCode(orderManagement.getOrganizeCode());
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
index e9d756c..e0f9f30 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
@@ -797,4 +797,6 @@ public class MesPcnExtConstWords {
     //螺钉包保存生产版本标记
     public static final String SAVE_PRODUCT_VERSION_FLAG = "ZFBT";
 
+    //发运组配置后写入mes_shipping_queue
+    public static final String MES_SHIPPING_QUEUE_SAVE_CFG = "MES_SHIPPING_QUEUE_SAVE_CFG";
 }