diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
index f4cef2c..1880a84 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
@@ -139,12 +139,12 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
         if(unCompleteCombineNumber > 0) {
             throw new ServiceException("托盘：" + containerCode + " 已经用于入库组盘");
         }
-        Container container = containerService.getContainerByCode(containerCode);
-        if(container != null) {
-            if(container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
-                throw new ServiceException("托盘已经锁定，不能再组盘");
-            }
-        }
+        //Container container = containerService.getContainerByCode(containerCode);
+        //if(container != null) {
+        //    if(container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+        //        throw new ServiceException("托盘已经锁定，不能再组盘");
+        //    }
+        //}
         //校验数量是否超出
         if((shipmentDetail.getShipQty().subtract(shipmentDetail.getRequestQty())).compareTo(shipmentCombinationModel.getShipQty())<0){
             throw new ServiceException("录入数量超出明细待出数量");
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index e80c7d9..f302d7f 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -336,7 +336,7 @@
                             actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传ERP</a>');
                         }
 
-                        if (row.firstStatus >= 500 && row.lastStatus >= 500 && row.shipmentType==='SCLLD' && row.mesSuccessStatus==='0'|| row.mesSuccessStatus==='2') {
+                        if (row.firstStatus >= 500 && row.lastStatus >= 500 && row.shipmentType==='SCLLD' && row.mesSuccessStatus!==1) {
                             actions.push('<a style="margin-left: 5px;background-color: #54b095" class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="toMes(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传MES</a>');
                         }
                         return actions.join('');