diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java index 46cf5465..892bdadc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java @@ -37,6 +37,16 @@ public class Station extends BaseEntity { */ public static final Integer PRE_STATUS_OCCUPIED = 2; + /** + * 取货输送线 站点类型常量 + */ + public static final String PICKUP_CONVEYOR_LINE = "1002"; + + /** + * 放货输送线 站点类型常量 + */ + public static final String DROPOFF_CONVEYOR_LINE = "1001"; + /** * 站点名称 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java index 40b450f2..29375d04 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/TaskExecuteRecord.java @@ -75,6 +75,12 @@ public class TaskExecuteRecord extends BaseEntity { @Schema(description = "任务的ID") private Long taskId; + /** + * 当前任务单号 + */ + @Schema(description = "当前任务单号") + private String taskCode; + /** * 默认使用方式: start:任务开始 outbin:走出储位 end:任务结束 cancel:任务单取消 apply:CTU料箱取放申请 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/constant/AgvConstant.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/constant/AgvConstant.java new file mode 100644 index 00000000..24bbfe86 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/constant/AgvConstant.java @@ -0,0 +1,19 @@ +package org.springblade.desk.logistics.constant; + +/** + * @author: liweidong + * @create: 2026-03-06 + */ +public interface AgvConstant { + + /** + * 设备类型:AGV (00) + */ + public static final String EQUIPMENT_TYPE_AGV = "00"; + + /** + * 设备类型:CTU (05) + */ + public static final String EQUIPMENT_TYPE_CTU = "05"; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPipelineService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPipelineService.java index dfa02cad..8f3cb9ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPipelineService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IPipelineService.java @@ -26,6 +26,8 @@ package org.springblade.desk.logistics.service; import org.springblade.core.tool.api.R; +import org.springblade.desk.logistics.pojo.entity.Station; +import org.springblade.desk.logistics.pojo.entity.Task; import java.math.BigDecimal; @@ -60,4 +62,16 @@ public interface IPipelineService { * @return */ boolean receiveBoxArriveConveyorEnd(String boxBarcode); + + + /** + * 调用AGV 小车 CTU 封装 + * @param taskType 任务类型 (QM3,QM5,QM6,QM7) + * @param startPos 开始位置 + * @param endPos 结束位置 + * @param type 位置类型(00:AGV 05:CTU) + * @param task 任务对象 + * @return + */ + boolean genAgvSchedulingTask(String taskType, String startPos, String endPos, String type, Task task); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java index 09108594..7929ce28 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/ITaskExecuteRecordService.java @@ -29,6 +29,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.logistics.pojo.dto.AGVCallBackDto; +import org.springblade.desk.logistics.pojo.entity.Task; import org.springblade.desk.logistics.pojo.entity.TaskExecuteRecord; import org.springblade.desk.logistics.pojo.vo.AgvSchedulingTaskVO; @@ -60,4 +61,11 @@ public interface ITaskExecuteRecordService extends BaseService implements ITaskExecuteRecordService { + @Autowired + TaskExecuteRecordMapper taskExecuteRecordMapper; + /** * AGV小车任务状态回调接口 *

@@ -224,6 +228,24 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl 0; + } + /** * 生成请求唯一标识 * @param prefix 前缀