diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java
index 09525e3..575e05c 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java
@@ -96,14 +96,14 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
 
         //验证当前是否属于装配件跳过码
         Boolean isSkip = checkIsSkip(productionProcessContext, equipVariableCollectContextList);
-        //验证当前是否属于装配件整体跳过码
-        Boolean isAllSkip = checkIsAllSkip(productionProcessContext, equipVariableCollectContextList, prodRuleContextList, stepResult);
+        //验证当前是否属于装配件整腔跳过码
+        Boolean isCavitySkip = checkIsCavitySkip(productionProcessContext, equipVariableCollectContextList, prodRuleContextList, stepResult);
 
         //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成]
-        Boolean result = isAllSkip ? true : doHandleMatchAssembly(reqBean, stepResult, prodRuleContextList, equipVariableCollectContextList, isSkip);
+        Boolean result = isCavitySkip ? true : doHandleMatchAssembly(reqBean, stepResult, prodRuleContextList, equipVariableCollectContextList, isSkip);
 
         //验证是否存在待绑定数据
-        hasUnBindAssembly = isAllSkip ? true : hasUnBindAssembly(prodRuleContextList);
+        hasUnBindAssembly = isCavitySkip ? true : hasUnBindAssembly(prodRuleContextList);
 
         //搜集装配件条码
         String suffix = MesPcnExtConstWords.EMPTY;
@@ -112,7 +112,7 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
         if (result || !hasUnBindAssembly) {
             productionDispatchContextStepService.dispatchProdRuleDataContext(reqBean, prodRuleContextList);
             assemblyShowNosortStepService.showProductionAssembly(reqBean, resultBean, productionProcessContext.getWorkCenter(), cellEquipContext, prodRuleContextList);
-            suffix = (isSkip || isAllSkip) ? stepResult.getMsg() : String.format("装配件条码%s匹配成功!", assemblySn);
+            suffix = (isSkip || isCavitySkip) ? stepResult.getMsg() : String.format("装配件条码%s匹配成功!", assemblySn);
         }
 
         //验证是否存在待绑定数据
@@ -171,11 +171,11 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
         return true;
     }
 
-    //验证当前是否属于装配件整体跳过码
-    private Boolean checkIsAllSkip(MesProductionProcessContext productionProcessContext, List<MesEquipVariableCollectContext> equipVariableCollectContextList, List<MesProdRuleContext> prodRuleContextList, StepResult stepResult) {
+    //验证当前是否属于装配件整腔跳过码
+    private Boolean checkIsCavitySkip(MesProductionProcessContext productionProcessContext, List<MesEquipVariableCollectContext> equipVariableCollectContextList, List<MesProdRuleContext> prodRuleContextList, StepResult stepResult) {
         if (equipVariableCollectContextList.size() > 1) return false;
         if (equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue()) != 0) return false;
-        if (!equipVariableCollectContextList.get(0).getEquipVariableValue().equals(productionProcessContext.getAssemblyAllSkipCode())) return false;
+        if (!equipVariableCollectContextList.get(0).getEquipVariableValue().equals(productionProcessContext.getAssemblyCavitySkipCode())) return false;
 
         //TODO
         return true;
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java
index 13f05df..e2795ad 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java
@@ -110,7 +110,7 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
         if (isCheckProcess && (StringUtils.isEmpty(productionProcessContext.getProcessCode()) || !productionProcessContext.getProcessCode().equals(reqBean.getProcessCode()))) processContext(reqBean, productionProcessContext);
 
         //生产过程上下文对象赋值生产过程控制全局密码
-        if (StringUtils.isEmpty(productionProcessContext.getFinishCode()) || StringUtils.isEmpty(productionProcessContext.getCraftJumpCode()) || StringUtils.isEmpty(productionProcessContext.getAssemblySkipCode()) || StringUtils.isEmpty(productionProcessContext.getAssemblyAllSkipCode())) productionPwdContext(reqBean, productionProcessContext);
+        if (StringUtils.isEmpty(productionProcessContext.getFinishCode()) || StringUtils.isEmpty(productionProcessContext.getCraftJumpCode()) || StringUtils.isEmpty(productionProcessContext.getAssemblySkipCode()) || StringUtils.isEmpty(productionProcessContext.getAssemblyCavitySkipCode())) productionPwdContext(reqBean, productionProcessContext);
 
         return productionProcessContext;
 
@@ -148,7 +148,7 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
         return productionProcessContext.finishCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.CAVITY_FINISH_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.CAVITY_FINISH_CODE).get(0).getCfgValue() : MesPcnExtConstWords.CAVITY_FINISH_CODE)
                 .craftJumpCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.CRAFT_JUMP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.CRAFT_JUMP_CODE).get(0).getCfgValue() : MesPcnExtConstWords.CRAFT_JUMP_CODE)
                 .assemblySkipCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.ASSEMBLY_SKIP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.ASSEMBLY_SKIP_CODE).get(0).getCfgValue() : MesPcnExtConstWords.ASSEMBLY_SKIP_CODE)
-                .assemblyAllSkipCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.ASSEMBLY_ALL_SKIP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.ASSEMBLY_ALL_SKIP_CODE).get(0).getCfgValue() : MesPcnExtConstWords.ASSEMBLY_ALL_SKIP_CODE);
+                .assemblyCavitySkipCode((!CollectionUtils.isEmpty(cfgKeyMap) && cfgKeyMap.containsKey(MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE)) ? cfgKeyMap.get(MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE).get(0).getCfgValue() : MesPcnExtConstWords.ASSEMBLY_CAVITY_SKIP_CODE);
     }
 
     //验证组织模型有效性
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java
index a1b4813..44fa99c 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java
@@ -44,8 +44,8 @@ public class MesProductionProcessContext implements Serializable {
     @ApiParam("装配件跳过码")
     private String assemblySkipCode;
 
-    @ApiParam("装配件整体跳过码")
-    private String assemblyAllSkipCode;
+    @ApiParam("装配件整腔跳过码")
+    private String assemblyCavitySkipCode;
 
     @ApiParam("生产线信息([Json]MesWorkCenter)")
     private String workCenterJson;
@@ -136,9 +136,9 @@ public class MesProductionProcessContext implements Serializable {
         return this.isNeedCache();
     }
 
-    //上下文赋值装配件整体跳过码
-    public MesProductionProcessContext assemblyAllSkipCode(String assemblyAllSkipCode) {
-        this.assemblyAllSkipCode = assemblyAllSkipCode;
+    //上下文赋值装配件整腔跳过码
+    public MesProductionProcessContext assemblyCavitySkipCode(String assemblyCavitySkipCode) {
+        this.assemblyCavitySkipCode = assemblyCavitySkipCode;
         return this.isNeedCache();
     }
 
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 1cab626..4fda132 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
@@ -233,8 +233,8 @@ public class MesPcnExtConstWords {
     public static final String CRAFT_JUMP_CODE = "CRAFT_JUMP_CODE";
     // 装配件跳过码
     public static final String ASSEMBLY_SKIP_CODE = "ASSEMBLY_SKIP_CODE";
-    // 装配件整体跳过码
-    public static final String ASSEMBLY_ALL_SKIP_CODE = "ASSEMBLY_ALL_SKIP_CODE";
+    // 装配件整腔跳过码
+    public static final String ASSEMBLY_CAVITY_SKIP_CODE = "ASSEMBLY_CAVITY_SKIP_CODE";
     // 设备代码[工步参数]
     public static final String EQUIPMENT_CODE_UC = "EQUIPMENT_CODE";
     // 模具号读一模多腔配置[工步参数]