倒计时

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesCountDownShowStepService.java

@@ -63,13 +63,14 @@ public class MesCountDownShowStepService extends BaseStepService {
         //不用显示倒计时, 客户端默认显示绿色无数字
         if (StringUtils.isEmpty(workCell.getIsShowTime()) || CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == workCell.getIsShowTime()) return stepResult;
 
-        //工位开启时间锁, 验证当前是否存在加工锁定状态
+        if (checkCellProductionLockIsExist(reqBean, resultBean, true, true))
-        Boolean isOpenTimeLock = (!StringUtils.isEmpty(workCell.getIsOpenTimeLock()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == workCell.getIsOpenTimeLock()) ? true : false;
-        if (isOpenTimeLock && checkCellProductionLockIsExist(reqBean, resultBean, true, true))
             execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("生产线[%s]工位[%s]已被锁定!请扫描解除锁定验证码!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
 
         if (isInit) return stepResult;
 
+        //工位开启时间锁, 验证当前是否存在加工锁定状态
+        Boolean isOpenTimeLock = (!StringUtils.isEmpty(workCell.getIsOpenTimeLock()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == workCell.getIsOpenTimeLock()) ? true : false;
+
         //解析工位参数
         String countDownTime = doCalcCountDownCfg(reqBean, isOpenTimeLock);