diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 2f1548cd..9729cc37 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -34,13 +34,12 @@ public interface LauncherConstant { // String NACOS_DEV_ADDR = "192.168.249.27:8848"; String NACOS_DEV_ADDR = "127.0.0.1:8848"; - /** + /**R * nacos prod 地址 */ String NACOS_PROD_ADDR = "172.30.0.48:8848"; - /** - * nacos test 地址 + /** * nacos test 地址 */ String NACOS_TEST_ADDR = "172.30.0.48:8848"; 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 e27becfb..467d80d1 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 @@ -53,6 +53,16 @@ public class Task extends BaseEntity { */ public static final Integer STATUS_TEMPORARY_STORAGE= 6; + /** + * mes调用ctu库位 + */ + public static final Integer STATUS_MES_CTU_k= 7; + + /** + * mes调用ctu梳齿架 + */ + public static final Integer STATUS_MES_CTU_s= 8; + /** * ID主键 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index e2ed46da..a1e0857d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -830,6 +830,8 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { if (agvResult) { log.info("【AGV调度】任务{}调度成功 - 类型:{}", task.getId(), taskType); + task.setTaskStatus(Task.STATUS_CONVEYOR_END); + taskService.updateById(task); return R.success(); } else { // 调度失败:回滚任务 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index 89c9edac..35a4d7e0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -201,6 +201,12 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { //调用成功 添加任务 if(null != ctuSchedulingTask && ctuSchedulingTask.getCode().equals("0")){ + firstTask.setTaskStatus(Task.STATUS_MES_CTU_s); + boolean taskUpdate = taskService.updateById(firstTask); + if (!taskUpdate) { + log.error("定时Task状态修改失败,但CTU调度已成功,taskCode:{}", firstTask); + } + // 添加任务 boolean record = taskExecuteRecordService.inboundRecord(ctuSchedulingTask, firstTask,null); if (record){ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java index 5487b1ae..54484bef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java @@ -162,10 +162,9 @@ public class TaskExecuteRecordServiceImpl extends BaseServiceImpl