From f173546356def1869ae3764d08468f882bca917f Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 31 Dec 2024 11:16:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=86=85=E5=8C=85=E9=97=B4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java | 2 ++ .../org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java | 2 +- .../b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java | 2 +- .../b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java | 2 +- .../b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java | 2 +- .../sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java | 2 +- .../sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java | 2 +- .../org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java | 2 +- .../ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java | 1 + .../service/iostorInv/util/impl/InVehicleManageServiceImpl.java | 1 + .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 1 + 11 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index 10a85d207..cccfa64d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -17,6 +17,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -27,6 +28,7 @@ import static org.nl.wms.util.TaskUtil.getRoutePlanCode; /** * Created by Lxy on 2021/12/22. */ +@Service public class TwoOutTask extends AbstractAcsTask { private final String THIS_CLASS = TwoOutTask.class.getName(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java index 29d3ba150..98c41664c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ShiftingTask.java @@ -67,7 +67,7 @@ public class ShiftingTask extends AbstractAcsTask { .priority(r.getPriority()) .remark(r.getRemark()) .product_area(r.getProduct_area()) - .agv_action_type(r.getVehicle_code2()) + .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")) .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("1楼诺宝任务")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java index 78478be7c..d9f8b6073 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendDjqToGzq.java @@ -199,7 +199,7 @@ public class AutoSendDjqToGzq { } else { task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode()); } - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("vehicle_code", shallowIvt.getContainer_name()); task1.put("point_code1", shallowIvt.getPoint_code()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java index c1da94ac2..cf146ae79 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java @@ -159,7 +159,7 @@ public class AutoSendGzqToDjq { String taskId = djqTask.createTask(task); //移库任务 JSONObject task1 = new JSONObject(); - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("point_code1", pointCode2); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java index 23d0db0f0..524ab04db 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendMzToDjq.java @@ -128,7 +128,7 @@ public class AutoSendMzToDjq { String taskId = djqTask.createTask(task); //移库任务 JSONObject task1 = new JSONObject(); - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("point_code1", pointCode2); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java index 3013099e0..c76ced10e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java @@ -192,7 +192,7 @@ public class AutoSendVehicleToDjq extends Prun{ taskId = sendGzqKzjTask.createTask(task); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务")); } - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("vehicle_code", groupIvtList.get(0).getContainer_name()); task1.put("point_code1", pointCode2); task1.put("point_code2", deepPointCode); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index a6c5f3b75..31fa2ac7c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -240,7 +240,7 @@ public class AutoSendVehicleToKzj { taskType = task.getString("task_type").equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")) ? PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务") : PackageInfoIvtEnum.TASK_TYPE.code("管制区移库任务"); JSONObject task1 = new JSONObject(); task1.put("task_type", taskType); - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); if (existTask != null) { task1.put("task_status", StringUtils.isBlank(pointCode4) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.SURE_END.getCode()); } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java index 06b6cf3c7..51a7dbb17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java @@ -130,7 +130,7 @@ public class TaskQueue { JSONObject task1 = new JSONObject(); String pointCode2 = packageinfoivtService.getDjqShiftingPoint(shallowIvt, true); task1.put("task_status", StringUtils.isBlank(pointCode2) ? TaskStatusEnum.SURE_START.getCode() : TaskStatusEnum.START_AND_POINT.getCode()); - task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("移库任务")); + task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区移库任务")); task1.put("vehicle_code", shallowIvt.getContainer_name()); task1.put("point_code1", shallowIvt.getPoint_code()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index b4dc8205a..986f1c2d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -105,6 +105,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { .eq("point_code1", whereJson.getString("device_code")) .eq("vehicle_code", whereJson.getString("box_no")) .eq("task_type", "010702") + .eq("is_delete", "0") .lt("task_status", TaskStatusEnum.FINISHED.getCode())); if (count>0){ return; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java index 7c69b2b26..cbced69e0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java @@ -74,6 +74,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { .eq("point_code1", whereJson.getString("device_code")) .eq("vehicle_code", whereJson.getString("vehicle_code")) .eq("task_type", "010705") + .eq("is_delete", "0") .lt("task_status", TaskStatusEnum.EXECUTING.getCode())); if (count>0){ return; 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 35579a649..c46bf47f5 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 @@ -2040,6 +2040,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { .eq("point_code1", whereJson.getString("device_code")) .eq("task_type", "010703") .eq("vehicle_code2", whereJson.getString("vehicle_code")) + .eq("is_delete", "0") .lt("task_status", TaskStatusEnum.EXECUTING.getCode())); if (count>0){ log.info("acs申请入库任务以存在直接跳过"+whereJson.getString("vehicle_code"));