root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:现场联调测试

Browse Source
This commit is contained in:
ls
2025-04-08 14:24:54 +08:00
parent a4e78afa1a
commit ec22035159
7 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
View File

@@ -13,7 +13,7 @@
FROM st_ivt_hotpointivt ht2
WHERE ht2.group_name = ht.group_name
AND ht2.plan <![CDATA[ <> ]]> 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

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

@@ -121,6 +121,13 @@ public interface ISchBaseTaskService extends IService<SchBaseTask> {
*/
List<SchBaseTask> checkHaveTask(String code);
/**
* 检测点位编码是否存在status<=7的任务
* @param code
* @return
*/
List<SchBaseTask> checkHaveTask2(String code);
/**
* 判断是否存在对应的桁架任务
* 参数like requestParam

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

@@ -18,6 +18,8 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
List<SchBaseTask> checkHaveTask(String code);
List<SchBaseTask> checkHaveTask2(String code);
List<SchBaseTask> checkHaveRelatedTaskInRequestParam(String param);
List<SchBaseTask> getWasteFoilTask(String code);

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

@@ -55,6 +55,17 @@
OR point_code4 = #{code}
)
</select>
<select id="checkHaveTask2" resultType="org.nl.wms.sch.task.service.dao.SchBaseTask">
SELECT *
FROM sch_base_task
WHERE task_status <![CDATA[ <= ]]> '07'
AND ( point_code1 = #{code}
OR point_code2 = #{code}
OR point_code3 = #{code}
OR point_code4 = #{code}
)
</select>
<select id="checkHaveRelatedTaskInRequestParam" resultType="org.nl.wms.sch.task.service.dao.SchBaseTask">
SELECT *
FROM sch_base_task

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

@@ -243,6 +243,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
return schBaseTaskMapper.checkHaveTask(code);
}
@Override
public List<SchBaseTask> checkHaveTask2(String code) {
return schBaseTaskMapper.checkHaveTask2(code);
}
@Override
public List<SchBaseTask> checkHaveRelatedTaskInRequestParam(String param) {
return schBaseTaskMapper.checkHaveRelatedTaskInRequestParam(param);

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawDownAGVTask.java
View File

@@ -67,7 +67,7 @@ public class RawDownAGVTask extends AbstractTask {
// 收卷辊库出口
String startPointCode = requestObj.getString("start_point_code");
// 查找烘箱对接位可用的位置（没货、没任务、没禁用）
List<SchBasePoint> hxPoints = pointService.getHotNotTaskPoint(A1, HX_REGION, POINT_TYPE_EMPTY, POINT_STATUS_EMPTY);
List<SchBasePoint> hxPoints = pointService.getAllBusinessTaskPoint(A1, HX_REGION, POINT_TYPE_EMPTY, POINT_STATUS_EMPTY,null,null);
if (hxPoints.size() == 0) {
throw new BadRequestException("烘箱没有可以用的对接位！");
}

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
View File

@@ -153,7 +153,7 @@ public class SlitterDownAGVTask extends AbstractTask {
throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与实际光电检测类型不匹配！");
}
if (!stIvtCutpointivt.getPlan().equals(bstIvtCutpointivt.getPlan())) {
break;
continue;
}
endPoint = bstIvtCutpointivt;