diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 382ba6d..be70dfe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -11,12 +11,21 @@ public interface AcsToWmsService { * ACS客户端--->WMS服务端 * ACS向WMS反馈任务状态 * - * @param string 条件 + * @param string ACS反馈的任务数组 * @return Map */ Map receiveTaskStatusAcs(String string); + + /** + * + * @param task_id: 任务标识 + * @return 二次申请的点位 + */ + String againApply(String task_id); + + /** * ACS客户端--->WMS服务端 * ACS向WMS反馈点位状态 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7a0be85..e60de0b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -112,6 +112,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return result; } + @Override + public String againApply(String task_id) { + return null; + } + @LokiLog(type = LokiLogType.ACS_TO_LMS) @Override public Map receivePointStatusFromAcs(Map jsonObject) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 850babe..28dcc20 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -14,8 +14,8 @@ import java.util.List; /** * Title: AbstractAcsTask.java Description:任务抽象类 *

- * Task状态:01生成 ,02:确定起点,03、确定终点,04、起点和终点都确认,05:下发,可以下发, 06、执行中 07、完成 - * 完成方式:01自动,02:wcs删除,03、wms删除,04、发给wcs失败自动删除 + * Task状态:1生成 ,2:确定起点,3、确定终点,4、起点和终点都确认,5:下发,可以下发, 6、执行中 7、完成 + * 完成方式:1自动,2:wcs删除,3、wms删除,4、发给wcs失败自动删除 * * @author ldjun * @created 2020年6月12日 下午5:53:28 @@ -160,5 +160,14 @@ public abstract class AbstractAcsTask { */ public abstract void cancel(String task_id); + /** + * + * @param task_id: 任务标识 + * @return 二次申请的点位 + */ + String againApply(String task_id){ + return null; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 6eddd5f..8469b61 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ