merge:代码合并

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@@ -1296,7 +1296,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
      * @param iostorinv_id： 单据标识
      * @return List<JSONObject> 生成任务的集合
      */
-    private List<JSONObject> createTaskMange(List<JSONObject> disLikeList, String iostorinv_id) {
+    private JSONObject createTaskMange(List<JSONObject> disLikeList, String iostorinv_id) {
         // 仓位表
         WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
 

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java

@@ -37,6 +37,10 @@ public abstract class AbstractAcsTask {
         return addTask();
     }
 
+    public List<AcsTaskDto> schedule(String taskId) {
+        return addTask(taskId);
+    }
+
     /**
      * 添加任务进行下发
      *
@@ -45,6 +49,10 @@ public abstract class AbstractAcsTask {
     public abstract List<AcsTaskDto> addTask();
 
     public List<AcsTaskDto> addTask(SchBaseTask task){
+        throw new BadRequestException("当前类没有重写addTask(task)方法");
+    };
+
+    public List<AcsTaskDto> addTask(String task_id){
         throw new BadRequestException("当前类没有重写addTask(taskId)方法");
     };