diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java
index ffcfdd1..9e58698 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnCheckStepService.java
@@ -176,6 +176,7 @@ public class MesProductSnCheckStepService extends BaseStepService {
             return stepResult;
         }
 
+        //TODO 问题点 自进自出 会导致不计数
         //未知条码, 工序为空, 条码数量等于1, 已打印 【打印件, 首工位自进自出未加工完成】
         if (produceSn.getPrintStatus().compareTo(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue()) == 0) {
 
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java
index 1e9b89c..55bfa1f 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnGenerateStepService.java
@@ -271,4 +271,8 @@ public class MesProductSnGenerateStepService extends BaseStepService {
         return isSamePart ? false : true;
     }
 
+    //TODO 问题点 未知 自进自出 会导致不计数   【再上面未知的地方判断 工序空，已打印状态, 并且自进自出 直接标记需要计数】--- 可以跟下面的合并逻辑进行修改
+    //TODO 打印件 已经是产成, 当时实际需要计数， 但是实际不会被计算上去  【再上面判断是否存在ID 工序空，已打印状态, 并且自进自出 直接标记需要计数】
+    //TODO 自进自出, 此前没有被计数, 这个时候也再会被计数 【目前无解, 业务上进行规避】
+
 }
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/MesWorkOrderCheckCompleteQtyStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/MesWorkOrderCheckCompleteQtyStepService.java
index a179a5a..16ff64a 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/MesWorkOrderCheckCompleteQtyStepService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/MesWorkOrderCheckCompleteQtyStepService.java
@@ -84,18 +84,12 @@ public class MesWorkOrderCheckCompleteQtyStepService extends BaseStepService {
 
         MesWorkOrderCompleteQtyContext workOrderCompleteQtyContext;
 
-        //工位维度=true ; 生产线维度=false,需要LOCK
-        if (isCellNoCalcQty) {
-            //处理工位维度的工单完成数上下文
-            workOrderCompleteQtyContext = productionCustomContextStepService.dispatchWorkOrderCompleteQtyCellContext(flag, reqBean, productionPartContextList.get(0), calcCompleteQty);
-            //已经在上下文中累加当前工序的工单完成数
-            if (flag == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) return;
-            //验证工单完成数
-            checkWorkOrderCompleteQty(reqBean, resultBean, stepResult, workCenter, workOrderCompleteQtyContext, calcCompleteQty);
-
-
-            return;
-        }
+        //处理工位维度的工单完成数上下文
+        workOrderCompleteQtyContext = productionCustomContextStepService.dispatchWorkOrderCompleteQtyCellContext(flag, reqBean, productionPartContextList.get(0), calcCompleteQty);
+        //已经在上下文中累加当前工序的工单完成数
+        if (flag == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) return;
+        //验证工单完成数
+        checkWorkOrderCompleteQty(reqBean, resultBean, stepResult, workCenter, workOrderCompleteQtyContext, calcCompleteQty);
 
     }