add: 收卷锟添加光电校验

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/OtherPdaServiceImpl.java

@@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
+import org.nl.wms.md.wastefoilrecord.service.dto.WastefoilrecordQuery;
 import org.nl.wms.pda.st.service.OtherPdaService;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 import org.nl.wms.sch.task_manage.TaskStatus;
@@ -53,6 +55,8 @@ public class OtherPdaServiceImpl implements OtherPdaService {
     private SendWasteFoilAGVTask sendWasteFoilAGVTask;
     @Autowired
     private ISchBasePointService pointService;
+    @Autowired
+    private SchBasePointServiceImpl schBasePointServiceImpl;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -238,6 +242,12 @@ public class OtherPdaServiceImpl implements OtherPdaService {
         log.info("手持呼叫AGV送样品检测 - {}", param);
         // point_code1, point_code2
         String pointCode1 = param.getString("point_code1");
+        SchBasePoint schBasePoint = schBasePointServiceImpl.getById(pointCode1);
+
+        List<SchBaseTask> schBaseTasks = taskService.cheackFqAndED(schBasePoint.getRegion_code());
+        if (schBaseTasks.size() > 0) {
+            throw new BadRequestException("已经存在其它区域的任务！");
+        }
         //不判断是否有执行的任务
 //        List<SchBaseTask> schBaseTasks = taskService.checkHaveTask(pointCode1);
 //        if (schBaseTasks.size() > 0) {

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java

@@ -168,4 +168,6 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
      * @return /
      */
     boolean checkAllWaiteByWasteFoil();
+
+    List<SchBaseTask> cheackFqAndED(String regionCode);
 }

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java

@@ -21,4 +21,6 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
     List<SchBaseTask> checkHaveRelatedTaskInRequestParam(String param);
 
     List<SchBaseTask> getWasteFoilTask(String code);
+
+    List<SchBaseTask> cheackFqAndED(String regionCode);
 }

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml

@@ -69,4 +69,19 @@
           AND task_status <![CDATA[ <> ]]> '07'
           AND request_param LIKE '%${code}%'
     </select>
+
+    <select id="cheackFqAndED" resultType="org.nl.wms.sch.task.service.dao.SchBaseTask">
+        SELECT *
+        FROM sch_base_task
+        WHERE task_status <![CDATA[ <= ]]> '071'
+          AND task_status <![CDATA[ <> ]]> '07'
+
+        <if test="regionCode != null and regionCode == 'A1_QY_FQ' ">
+            AND point_code1 LIKE '%${QY_ED}%'
+        </if>
+
+        <if test="regionCode != null and regionCode == 'A1_QY_ED' ">
+            AND point_code1 LIKE '%${QY_FQ}%'
+        </if>
+    </select>
 </mapper>

lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -304,4 +304,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         return list.size() == 0;
     }
 
+    @Override
+    public List<SchBaseTask> cheackFqAndED(String regionCode) {
+        return schBaseTaskMapper.cheackFqAndED(regionCode);
+    }
+
 }