diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
deleted file mode 100644
index 8cd8b559f..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogErrorMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-///*
-// *  Copyright 2019-2020 Zheng Jie
-// *
-// *  Licensed under the Apache License, Version 2.0 (the "License");
-// *  you may not use this file except in compliance with the License.
-// *  You may obtain a copy of the License at
-// *
-// *  http://www.apache.org/licenses/LICENSE-2.0
-// *
-// *  Unless required by applicable law or agreed to in writing, software
-// *  distributed under the License is distributed on an "AS IS" BASIS,
-// *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// *  See the License for the specific language governing permissions and
-// *  limitations under the License.
-// */
-//package org.nl.modules.logging.service.mapstruct;
-//
-//import org.mapstruct.Mapper;
-//import org.mapstruct.ReportingPolicy;
-//import org.nl.modules.common.base.BaseMapper;
-//import org.nl.modules.logging.domain.Log;
-//import org.nl.modules.logging.service.dto.LogErrorDTO;
-//
-///**
-// * @author Zheng Jie
-// * @date 2019-5-22
-// */
-//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-//public interface LogErrorMapper extends BaseMapper<LogErrorDTO, Log> {
-//
-//}
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
deleted file mode 100644
index a86f7d507..000000000
--- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/mapstruct/LogSmallMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-///*
-// *  Copyright 2019-2020 Zheng Jie
-// *
-// *  Licensed under the Apache License, Version 2.0 (the "License");
-// *  you may not use this file except in compliance with the License.
-// *  You may obtain a copy of the License at
-// *
-// *  http://www.apache.org/licenses/LICENSE-2.0
-// *
-// *  Unless required by applicable law or agreed to in writing, software
-// *  distributed under the License is distributed on an "AS IS" BASIS,
-// *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// *  See the License for the specific language governing permissions and
-// *  limitations under the License.
-// */
-//package org.nl.modules.logging.service.mapstruct;
-//
-//import org.mapstruct.Mapper;
-//import org.mapstruct.ReportingPolicy;
-//import org.nl.modules.common.base.BaseMapper;
-//import org.nl.modules.logging.domain.Log;
-//import org.nl.modules.logging.service.dto.LogSmallDTO;
-//
-///**
-// * @author Zheng Jie
-// * @date 2019-5-22
-// */
-//@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-//public interface LogSmallMapper extends BaseMapper<LogSmallDTO, Log> {
-//
-//}
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index 2fe497bf1..c8c115049 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -77,7 +77,11 @@ public class BakingServiceImpl implements BakingService {
             String temperature = whereJson.getString("temperature"); // 温度
             String hours = whereJson.getString("hours"); // 时间
             String point_code1 = whereJson.getString("point_code"); // 点位
-
+            //查询该点位是否存在未完成的任务
+            JSONObject hasTask = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code1 + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
+            if (hasTask!=null) {
+                throw new BadRequestException("当前点位"+point_code1+"存在正在执行的任务"+hasTask.getString("task_code"));
+            }
             //校验该设备是否启用，且母卷MES是否请求烘烤
             //查询该母卷号、设备号对应的生箔工单
             JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + container_name + "'").uniqueResult(0);