From 2753f58c2415fc16297ba8cc43990145c19bf588 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 7 Feb 2026 18:23:41 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PdaPackagingServiceImpl.java | 2 ++ .../wms/sch_manage/service/util/tasks/CallMaterialTask.java | 5 +---- .../nl/wms/sch_manage/service/util/tasks/CenterInTask.java | 5 +---- .../wms/sch_manage/service/util/tasks/CheckBackMoveTask.java | 5 +---- .../nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java | 5 +---- .../nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java | 4 +--- .../sch_manage/service/util/tasks/EmpStackPlatesTask.java | 2 ++ .../wms/sch_manage/service/util/tasks/EmpVehicleInTask.java | 5 +---- .../wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java | 5 +---- .../sch_manage/service/util/tasks/EmptyDiskEnterTask.java | 1 - .../org/nl/wms/sch_manage/service/util/tasks/HandInTask.java | 5 +---- .../nl/wms/sch_manage/service/util/tasks/HandOutTask.java | 5 +---- .../nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java | 5 +---- .../sch_manage/service/util/tasks/IntermediateOutTask.java | 5 +---- .../wms/sch_manage/service/util/tasks/MaterialBackTask.java | 3 --- .../wms/sch_manage/service/util/tasks/NoCarUnloadTask.java | 1 - .../nl/wms/sch_manage/service/util/tasks/PalletOutTask.java | 3 --- .../sch_manage/service/util/tasks/PalletizingAddTask.java | 1 + .../sch_manage/service/util/tasks/PdaNotCarUnloadTask.java | 1 - .../nl/wms/sch_manage/service/util/tasks/PdaPointTask.java | 1 - .../sch_manage/service/util/tasks/PreProcessingInTask.java | 3 --- .../nl/wms/sch_manage/service/util/tasks/ProduceInTask.java | 3 --- .../org/nl/wms/sch_manage/service/util/tasks/RawInTask.java | 3 --- .../wms/sch_manage/service/util/tasks/TabletingInTask.java | 4 +--- .../wms/sch_manage/service/util/tasks/WrappingDownTask.java | 1 + .../nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java | 3 --- 26 files changed, 18 insertions(+), 68 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java index d24ca67..0d04710 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/packaging_management/service/impl/PdaPackagingServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.wms.pdm_management.service.dao.MdPdmPackaging; import org.nl.wms.pdm_management.service.dao.mapper.MdPdmPackagingMapper; import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; +import org.nl.wms.sch_manage.service.util.ACSTaskTypeEnum; import org.nl.wms.sch_manage.service.util.tasks.PackagingMiddleTask; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; @@ -212,6 +213,7 @@ public class PdaPackagingServiceImpl implements PdaPackagingService { jsonTask.put("point_code4", whereJson.getString("in_point_code")); jsonTask.put("material_id", rows.get(0).getString("material_id")); jsonTask.put("material_qty", whereJson.getString("total_qty")); + jsonTask.put("task_type", ACSTaskTypeEnum.AGV_TASK.getCode()); packagingMiddleTask.create(jsonTask); return PdaResponse.requestOk(); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java index 1e7a155..03d199f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CallMaterialTask.java @@ -109,13 +109,10 @@ public class CallMaterialTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(taskDao.getIs_wait()); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java index 172a6a5..9ffb0f3 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CenterInTask.java @@ -90,13 +90,10 @@ public class CenterInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java index b788a94..c1ff96d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java @@ -122,13 +122,10 @@ public class CheckBackMoveTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java index 38fb94b..03f6876 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java @@ -109,13 +109,10 @@ public class CheckMoveTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ONE); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java index 026817d..2576619 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CoatingUpTask.java @@ -66,6 +66,7 @@ public class CoatingUpTask extends AbstractTask { return task.getTask_id(); } + @Override public AcsTaskDto sendAcsParam(String taskId) { SchBaseTask taskDao = taskService.getById(taskId); @@ -78,13 +79,10 @@ public class CoatingUpTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java index 0a30f14..e553c91 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpStackPlatesTask.java @@ -17,6 +17,7 @@ import org.nl.wms.sch_manage.service.ISchBasePointService; import org.nl.wms.sch_manage.service.ISchBaseTaskService; import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.dao.SchBaseTask; +import org.nl.wms.sch_manage.service.util.ACSTaskTypeEnum; import org.nl.wms.sch_manage.service.util.AbstractTask; import org.nl.wms.sch_manage.service.util.AcsTaskDto; import org.nl.wms.sch_manage.service.util.TaskType; @@ -176,6 +177,7 @@ public class EmpStackPlatesTask extends AbstractTask { jsonTask.put("point_code1", IOSConstant.AGVZJZ001); jsonTask.put("point_code2", taskObj.getPoint_code3()); jsonTask.put("point_code3", taskObj.getPoint_code3()); + jsonTask.put("task_type", ACSTaskTypeEnum.AGV_TASK.getCode()); this.create(jsonTask); } else { // 更新当前点位载具数量 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java index fd026fa..6d19fd8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java @@ -106,13 +106,10 @@ public class EmpVehicleInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java index ba12c7a..b9b59a4 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleOutTask.java @@ -97,13 +97,10 @@ public class EmpVehicleOutTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java index 8507418..7a65312 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskEnterTask.java @@ -88,7 +88,6 @@ public class EmptyDiskEnterTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java index 549d2ec..066ff5c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandInTask.java @@ -97,13 +97,10 @@ public class HandInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java index a63a501..bfac072 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java @@ -116,13 +116,10 @@ public class HandOutTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(taskDao.getIs_wait()); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java index b16de4f..b07331f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/InsideMoveTask.java @@ -91,13 +91,10 @@ public class InsideMoveTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java index d92b2d5..e0eec62 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/IntermediateOutTask.java @@ -115,13 +115,10 @@ public class IntermediateOutTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(taskDao.getIs_wait()); - acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java index be1ebb6..8d1471a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MaterialBackTask.java @@ -92,13 +92,10 @@ public class MaterialBackTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java index 492e243..9973d61 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/NoCarUnloadTask.java @@ -109,7 +109,6 @@ public class NoCarUnloadTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java index a907172..6442aa8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletOutTask.java @@ -125,13 +125,10 @@ public class PalletOutTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(taskDao.getIs_wait()); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java index f0301ba..c460c7d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingAddTask.java @@ -79,6 +79,7 @@ public class PalletizingAddTask extends AbstractTask { acsTaskDto.setStart_device_code(taskDao.getPoint_code1()); acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java index 118c987..e831662 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaNotCarUnloadTask.java @@ -88,7 +88,6 @@ public class PdaNotCarUnloadTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index 199fe4a..ddbb254 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -89,7 +89,6 @@ public class PdaPointTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java index a200a09..9341285 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PreProcessingInTask.java @@ -90,13 +90,10 @@ public class PreProcessingInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java index de1cf5e..17633b6 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/ProduceInTask.java @@ -87,13 +87,10 @@ public class ProduceInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java index b6de172..a7e1a01 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java @@ -93,13 +93,10 @@ public class RawInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java index 45334b4..43954cd 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/TabletingInTask.java @@ -100,6 +100,7 @@ public class TabletingInTask extends AbstractTask { return task.getTask_id(); } + @Override public AcsTaskDto sendAcsParam(String taskId) { SchBaseTask taskDao = taskService.getById(taskId); @@ -112,13 +113,10 @@ public class TabletingInTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java index 2cd34b8..65538d8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java @@ -94,6 +94,7 @@ public class WrappingDownTask extends AbstractTask { acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); + acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java index 28e7d26..1d33368 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingUpTask.java @@ -95,13 +95,10 @@ public class WrappingUpTask extends AbstractTask { acsTaskDto.setVehicle_code(taskDao.getVehicle_code()); acsTaskDto.setVehicle_type(IOSConstant.ONE); - acsTaskDto.setIs_wait(IOSConstant.ZERO); acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.TWO); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; }