feat:子卷质检合格

This commit is contained in:
2026-08-18 18:27:14 +08:00
parent 3ec762c7a3
commit ed8b688cf8
18 changed files with 501 additions and 28 deletions

View File

@@ -54,6 +54,15 @@ public interface TransportTaskApi {
@Operation(summary = "根据 taskCode 查询任务")
CommonResult<TaskInfoDTO> getTaskByCode(@RequestParam("taskCode") String taskCode);
/**
* 根据点位编码查询第一条未完成任务
*
* @param pointCode 点位编码
* @return 未完成任务
*/
@GetMapping(PREFIX + "/getFirstUnfinishedTaskByPointCode")
CommonResult<TaskInfoDTO> getFirstUnfinishedTaskByPointCode(@RequestParam("pointCode") String pointCode);
@GetMapping(PREFIX + "/getRunningTaskByMaterialId")
@Operation(summary = "根据 materialId 和 ownerService 查询运行中任务")
CommonResult<List<TaskInfoDTO>> getRunningTaskByMaterialId(@RequestParam("materialId") Long materialId,

View File

@@ -63,6 +63,17 @@ public class TransportTaskApiImpl implements TransportTaskApi {
return success(transportTaskService.getTaskInfoByCode(taskCode));
}
/**
* 根据点位编码查询第一条未完成任务
*
* @param pointCode 点位编码
* @return 未完成任务
*/
@Override
public CommonResult<TaskInfoDTO> getFirstUnfinishedTaskByPointCode(String pointCode) {
return success(transportTaskService.getFirstUnfinishedTaskByPointCode(pointCode));
}
@Override
public CommonResult<List<TaskInfoDTO>> getRunningTaskByMaterialId(Long materialId, String ownerService) {
return success(transportTaskService.getRunningTaskInfoByMaterialId(materialId, ownerService));

View File

@@ -126,6 +126,14 @@ public interface TransportTaskMapper extends BaseMapperX<TransportTaskDO> {
*/
long selectUnfinishedCountByPointCodes(@Param("pointCodes") List<String> pointCodes);
/**
* 根据点位编码查询第一条未完成任务
*
* @param pointCode 点位编码
* @return 未完成任务
*/
TransportTaskDO selectFirstUnfinishedByPointCode(@Param("pointCode") String pointCode);
/**
* 根据任务类型和状态查询搬运任务
*

View File

@@ -107,6 +107,14 @@ public interface TransportTaskService {
*/
TaskInfoDTO getTaskInfoByCode(String taskCode);
/**
* 根据点位编码查询第一条未完成任务
*
* @param pointCode 点位编码
* @return 未完成任务
*/
TaskInfoDTO getFirstUnfinishedTaskByPointCode(String pointCode);
/**
* 根据物料ID和业务归属查询运行中任务状态小于75
*

View File

@@ -221,6 +221,18 @@ public class TransportTaskServiceImpl implements TransportTaskService {
return TransportTaskConvert.INSTANCE.convert(task);
}
/**
* 根据点位编码查询第一条未完成任务
*
* @param pointCode 点位编码
* @return 未完成任务
*/
@Override
public TaskInfoDTO getFirstUnfinishedTaskByPointCode(String pointCode) {
TransportTaskDO task = transportTaskMapper.selectFirstUnfinishedByPointCode(pointCode);
return TransportTaskConvert.INSTANCE.convert(task);
}
@Override
public List<TaskInfoDTO> getRunningTaskInfoByMaterialId(Long materialId, String ownerService) {
List<TransportTaskDO> tasks = transportTaskMapper.selectRunningListByMaterialId(materialId, ownerService);

View File

@@ -27,6 +27,22 @@
)
</select>
<select id="selectFirstUnfinishedByPointCode"
resultType="cn.code.nl.module.task.dal.dataobject.transporttask.TransportTaskDO">
SELECT *
FROM task_transport_job
WHERE deleted = b'0'
AND task_status &lt; '75'
AND (
point_code1 = #{pointCode}
OR point_code2 = #{pointCode}
OR point_code3 = #{pointCode}
OR point_code4 = #{pointCode}
)
ORDER BY task_id DESC
LIMIT 1
</select>
<select id="selectListByTypeAndStatus"
resultType="cn.code.nl.module.task.dal.dataobject.transporttask.TransportTaskDO">
SELECT *