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 436a2df..b4d74fb 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
@@ -500,6 +500,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         for (MesShippingOrderManagementDetail detail : orderManagementDetailList) {
             if (!Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
                 BeanUtils.copyProperties(custInfoSeqMap.get(detail.getId()).iterator().next(), detail);
+            } else if (!StringUtil.isEmpty(detail.getBarcode()) && detail.getBarcode().contains(MesPcnExtConstWords.COMMA)) {
+                detail.setVisualOrderNo(detail.getBarcode().split(MesPcnExtConstWords.COMMA)[MesPcnExtConstWords.ZERO]);
             }
             //更新条码信息，更新目视单信息
             if(!StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)){
@@ -519,15 +521,13 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     workOrderNoList.add(detail.getVisualOrderNo());
                     //更新应急件库位管理库存出库
                     mesEmergencyLocationService.doShippingStockOutOnline(organizeCode, detail.getVisualOrderNo(), userInfo, true);
+                    //条码格式(扫描目视单,扫描条码)
+                    detail.setBarcode(new StringJoiner(MesPcnExtConstWords.COMMA).add(detail.getVisualOrderNo()).add(detail.getBarcode()).toString());
                 }
             }
             //客供品移库
             customerSupplyMove(orderManagement, userInfo, sortShippingModel, shippingList, detail);
 
-            //条码格式(扫描目视单,扫描条码)
-            if(!StringUtil.isEmpty(detail.getVisualOrderNo())){
-                detail.setBarcode(new StringJoiner(MesPcnExtConstWords.COMMA).add(detail.getVisualOrderNo()).add(detail.getBarcode()).toString());
-            }
             detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
             detail.setActualQty(MesPcnExtConstWords.ONE);
             ConvertBean.serviceModelUpdate(detail, userInfo);
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java
index 425c21c..627196f 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnAndOrderStrategyServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.shippingscan.strategy;
 
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesEmergencyLocationService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog;
@@ -63,6 +64,9 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin
     @Autowired
     private IMesWorkOrderExtService mesWorkOrderExtService;
 
+    @Autowired
+    private IMesEmergencyLocationService mesEmergencyLocationService;
+
     @Override
     public MesSortShippingCheckModel doScan(MesSortShippingCheckModel model, MesShippingOrderManagement orderManagement, MesPartShippingGroup shippingGroup) {
         if (!Objects.isNull(model.getLastShippingDetailId())) {
@@ -261,6 +265,8 @@ public class MesShippingScanSnAndOrderStrategyServiceImpl implements IMesShippin
                 }
                 //更新工单状态为发运
                 mesWorkOrderExtService.updateMesWorkOrderOrderStatusShippingByWorkOrderNo(orderManagement.getOrganizeCode(), Stream.of(workOrder.getWorkOrderNo()).collect(Collectors.toList()), userInfo);
+                //更新应急件库位管理库存出库
+                mesEmergencyLocationService.doShippingStockOutOnline(orderManagement.getOrganizeCode(), detail.getVisualOrderNo(), userInfo, true);
             }
         }
     }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
index 802af73..cc0cfe8 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/shippingscan/strategy/MesShippingScanSnStrategyServiceImpl.java
@@ -69,6 +69,7 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
     @Autowired
     private IMesShippingSnUniqueService mesShippingSnUniqueService;
 
+    @Override
     public MesSortShippingCheckModel doScan(MesSortShippingCheckModel model, MesShippingOrderManagement orderManagement, MesPartShippingGroup shippingGroup) {
         //校验条码
         MesProduceSn produceSn = checkSn(model);