Merge remote-tracking branch 'origin/master'

production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java

@@ -317,6 +317,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             QueryWrapper<SfcHoldLog> queryWrapper=new QueryWrapper<>();
             queryWrapper.eq(SfcHoldLog.SFC,sfc);
             queryWrapper.eq(SfcHoldLog.STEP_ID,stepId);
+            queryWrapper.eq(SfcHoldLog.TYPE,"CANCEL");
             List<SfcHoldLog> list = sfcHoldLogService.list(queryWrapper);
             if (!list.isEmpty()){
                 BigDecimal holdTime = list.stream().map(SfcHoldLog::getHoldDuration).reduce(BigDecimal.ZERO, BigDecimal::add);