diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java index 467d80d1..26bd50c9 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Task.java @@ -54,14 +54,19 @@ public class Task extends BaseEntity { public static final Integer STATUS_TEMPORARY_STORAGE= 6; /** - * mes调用ctu库位 + * mes调用ctu到库位(上) */ - public static final Integer STATUS_MES_CTU_k= 7; + public static final Integer STATUS_MES_CTU_UP= 7; /** - * mes调用ctu梳齿架 + * mes调用ctu梳齿架(下) */ - public static final Integer STATUS_MES_CTU_s= 8; + public static final Integer STATUS_MES_CTU_BELOW= 8; + + /** + * 虚拟货架绑定失败 + */ + public static final Integer BOUND_VIRTUAL_SHELVES= 9; /** * ID主键 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 96fdc94b..b078067b 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 @@ -25,6 +25,7 @@ */ package org.springblade.desk.logistics.service; +import com.alibaba.fastjson2.JSONObject; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.logistics.pojo.dto.AGVCallBackDto; @@ -49,7 +50,7 @@ public interface ITaskExecuteRecordService extends BaseService requestBody = new HashMap<>(); @@ -284,19 +284,12 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl