diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml index 156bfe6be..79a3705d0 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml @@ -13,7 +13,7 @@ FROM st_ivt_hotpointivt ht2 WHERE ht2.group_name = ht.group_name AND ht2.plan ]]> ht.plan - AND ht2.point_status = '02') + AND ht2(ht2.point_status = '02' || ht2.point_status = '04')) AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code2 = ht.point_code diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index ad2b038f1..d3b9260c0 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -121,6 +121,13 @@ public interface ISchBaseTaskService extends IService { */ List checkHaveTask(String code); + /** + * 检测点位编码是否存在status<=7的任务 + * @param code + * @return + */ + List checkHaveTask2(String code); + /** * 判断是否存在对应的桁架任务 * 参数like requestParam diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java index cf73eee08..932410c9c 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java @@ -18,6 +18,8 @@ public interface SchBaseTaskMapper extends BaseMapper { List checkHaveTask(String code); + List checkHaveTask2(String code); + List checkHaveRelatedTaskInRequestParam(String param); List getWasteFoilTask(String code); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml index aad277bc8..cf250adb7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml @@ -55,6 +55,17 @@ OR point_code4 = #{code} ) + +