From caa96ef03e845e1e460371f5a9d9aadb35fc3611 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 5 Feb 2026 14:50:18 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BuckController.java | 1 + .../ext/service/impl/AcsToWmsServiceImpl.java | 4 ---- .../controller/PdaPointAndPointController.java | 1 + .../wms/sch_manage/service/util/AcsTaskDto.java | 5 ++--- .../service/util/tasks/CallMaterialTask.java | 2 +- .../service/util/tasks/CenterInTask.java | 2 +- .../service/util/tasks/CheckBackMoveTask.java | 2 +- .../service/util/tasks/CheckMoveTask.java | 2 +- .../service/util/tasks/CoatingUpTask.java | 2 +- .../service/util/tasks/EmpVehicleInTask.java | 2 +- .../service/util/tasks/EmpVehicleOutTask.java | 2 +- .../service/util/tasks/EmptyDiskConveyTask.java | 11 +---------- .../service/util/tasks/EmptyDiskEnterTask.java | 6 ++---- .../service/util/tasks/HandInTask.java | 2 +- .../service/util/tasks/HandOutTask.java | 2 +- .../service/util/tasks/InsideMoveTask.java | 2 +- .../service/util/tasks/IntermediateOutTask.java | 2 +- .../service/util/tasks/MaterialBackTask.java | 2 +- .../service/util/tasks/NoCarUnloadTask.java | 2 +- .../service/util/tasks/PalletOutTask.java | 2 +- .../service/util/tasks/PalletizingAddTask.java | 15 ++------------- .../service/util/tasks/PalletizingDownTask.java | 17 ++++------------- .../service/util/tasks/PdaNotCarUnloadTask.java | 2 +- .../service/util/tasks/PdaPointTask.java | 2 +- .../service/util/tasks/PreProcessingInTask.java | 2 +- .../service/util/tasks/ProduceInTask.java | 2 +- .../service/util/tasks/RawInTask.java | 2 +- .../service/util/tasks/TabletingInTask.java | 2 +- .../service/util/tasks/WrappingDownTask.java | 2 +- .../service/util/tasks/WrappingUpTask.java | 2 +- .../warehouse_management/enums/IOSConstant.java | 5 +++++ .../service/impl/VehicleOutServiceImpl.java | 2 +- wms/nladmin-ui/src/views/login.vue | 8 ++++---- .../src/views/monitor/server/index.vue | 3 +++ wms/nladmin-ui/src/views/wms/sch/task/index.vue | 4 ++-- 35 files changed, 50 insertions(+), 76 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java index 651d213..1b1fc72 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/BuckController.java @@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.wms.basedata_manage.service.IMdPdGroupbucketService; import org.nl.wms.basedata_manage.service.dao.MdPdGroupbucket; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index f401b9a..c113992 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -185,10 +185,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { secondaryPackagingService.palletizingCallEmpty(whereJson); } } - /* // 拆盘机 - if (type.equals(IOSConstant.THREE)) { - // 找一垛空托盘 - }*/ } else { throw new BadRequestException("设备编码为：" + device_code + "的设备正在操作中！"); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java index 5af8886..1ad947c 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaPointAndPointController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.wms.pda.general_management.service.PdaPointAndPointBoxService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java index 150a79d..d921d6b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java @@ -92,9 +92,8 @@ public class AcsTaskDto { /** * Agv系统类型 - * 1:1楼叉车系统 - * 2:2楼1区域AGV系统 - * 3:2楼2区域AGV系统 + * 2:NDC系统 + * 3:海康系统 */ String agv_system_type; 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 0bd3af9..1e7a155 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 @@ -113,7 +113,7 @@ public class CallMaterialTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 f1dde07..172a6a5 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 @@ -94,7 +94,7 @@ public class CenterInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 723baa1..b788a94 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 @@ -126,7 +126,7 @@ public class CheckBackMoveTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 06ae677..38fb94b 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 @@ -113,7 +113,7 @@ public class CheckMoveTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 69268c0..026817d 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 @@ -82,7 +82,7 @@ public class CoatingUpTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 87dac6f..fd026fa 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 @@ -110,7 +110,7 @@ public class EmpVehicleInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 b0429e1..ba12c7a 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 @@ -101,7 +101,7 @@ public class EmpVehicleOutTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java index 0d78daa..55feaf0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmptyDiskConveyTask.java @@ -27,7 +27,7 @@ import javax.annotation.Resource; import java.util.List; /** - * 空盘运输任务 + * 空盘运输任务 海康任务 * @author: lyd * @date: 2026/1/12 */ @@ -87,8 +87,6 @@ public class EmptyDiskConveyTask extends AbstractTask { acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.THREE); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } @@ -140,13 +138,6 @@ public class EmptyDiskConveyTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) .set(SchBasePoint::getIng_task_code, "") ); - pointService.update( - new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, "") - .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("空载具")) - .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) - .set(SchBasePoint::getIng_task_code, "") - ); // 判断是否需要呼叫空盘 List palletPoints = pointService.getNoTaskPointByRegionAndType("WBZQ", "2", "1"); 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 d72a5ee..4bc5ea6 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 @@ -52,7 +52,7 @@ public class EmptyDiskEnterTask extends AbstractTask { task.setTask_code(CodeUtil.getNewCode("TASK_CODE")); task.setTask_status(TaskStatus.CREATED.getCode()); task.setConfig_code(EmptyDiskEnterTask.class.getSimpleName()); - task.setPoint_code1("ZBJ01"); + task.setPoint_code1(IOSConstant.CBJ01); task.setPoint_code2(point.getPoint_code()); task.setPoint_code3(json.getString("device_code")); task.setVehicle_code(json.getString("vehicle_code")); @@ -92,9 +92,7 @@ public class EmptyDiskEnterTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); return acsTaskDto; } 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 910f93e..549d2ec 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 @@ -101,7 +101,7 @@ public class HandInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 dfedc22..a63a501 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 @@ -120,7 +120,7 @@ public class HandOutTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 d16b1d9..b16de4f 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 @@ -95,7 +95,7 @@ public class InsideMoveTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 dc50c54..d92b2d5 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 @@ -119,7 +119,7 @@ public class IntermediateOutTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.CTU_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 1a9330f..be1ebb6 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 @@ -96,7 +96,7 @@ public class MaterialBackTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 a0ed65d..406ee80 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 @@ -98,7 +98,7 @@ public class NoCarUnloadTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); return acsTaskDto; } 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 a252632..a907172 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 @@ -129,7 +129,7 @@ public class PalletOutTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 75fecd3..a545a9f 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 @@ -64,7 +64,7 @@ public class PalletizingAddTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -85,9 +85,7 @@ public class PalletizingAddTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); return acsTaskDto; } @@ -139,15 +137,6 @@ public class PalletizingAddTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1()) .set(SchBasePoint::getIng_task_code, "") ); - - // 更新 - pointService.update( - new UpdateWrapper().lambda() - .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) - .set(SchBasePoint::getPoint_status, IOSEnum.POINT_STATUS.code("有箱有料")) - .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) - .set(SchBasePoint::getIng_task_code, "") - ); } @Override diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java index 333520d..9344205 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PalletizingDownTask.java @@ -8,7 +8,6 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; -import org.nl.wms.basedata_manage.service.dao.Sectattr; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBasePointService; @@ -25,10 +24,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import java.util.Map; /** * 码垛下料 + * * @author: lyd * @date: 2026/1/9 */ @@ -40,6 +39,7 @@ public class PalletizingDownTask extends AbstractTask { private ISchBaseTaskService taskService; @Resource(name = "PalletizingAddTask") private PalletizingAddTask palletizingAddTask; + @Override public String create(JSONObject json) { // 查找空闲的内外中转点 @@ -71,7 +71,7 @@ public class PalletizingDownTask extends AbstractTask { throw new BadRequestException("起点终点不能一致，请检查!"); } // 下发任务 -// this.sendTaskOne(task.getTask_id()); + this.sendTaskOne(task.getTask_id()); return task.getTask_id(); } @@ -93,8 +93,6 @@ public class PalletizingDownTask extends AbstractTask { acsTaskDto.setPriority(IOSConstant.ONE); acsTaskDto.setAgv_system_type(IOSConstant.THREE); - acsTaskDto.setIs_get_pause(IOSConstant.ZERO); - acsTaskDto.setIs_put_pause(IOSConstant.ZERO); return acsTaskDto; } @@ -145,15 +143,8 @@ public class PalletizingDownTask extends AbstractTask { .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) .set(SchBasePoint::getIng_task_code, "") ); - // 创建出去缠绕机或者空点位 + // 创建出去缠绕机的任务 List pointList = pointService.getCRUsedDevice(); - if (pointList.size() == 0) { - // 查找空位置, todo: 先不考虑二次分配 - pointList = pointService.getNoTaskPointByRegionAndType("CRHCQ", "1", "1"); - } - if (pointList.size() == 0) { - throw new BadRequestException("找不到可存放的空位！"); - } SchBasePoint point = pointList.get(0); JSONObject taskParam = new JSONObject(); taskParam.put("point_code1", taskObj.getPoint_code2()); 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 577c1fd..118c987 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 @@ -92,7 +92,7 @@ public class PdaNotCarUnloadTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); return acsTaskDto; } 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 bf8ebee..199fe4a 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 @@ -93,7 +93,7 @@ public class PdaPointTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); return acsTaskDto; } 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 18a6ab1..a200a09 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 @@ -94,7 +94,7 @@ public class PreProcessingInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 a1554f8..de1cf5e 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 @@ -91,7 +91,7 @@ public class ProduceInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 a586da7..b6de172 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 @@ -97,7 +97,7 @@ public class RawInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 8d2b045..45334b4 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 @@ -116,7 +116,7 @@ public class TabletingInTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 600c1d4..385ddf6 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 @@ -100,7 +100,7 @@ public class WrappingDownTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); 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 3cd07a4..28e7d26 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 @@ -99,7 +99,7 @@ public class WrappingUpTask extends AbstractTask { acsTaskDto.setTask_type(ACSTaskTypeEnum.AGV_TASK.getCode()); acsTaskDto.setPriority(IOSConstant.ONE); - acsTaskDto.setAgv_system_type(IOSConstant.THREE); + acsTaskDto.setAgv_system_type(IOSConstant.TWO); acsTaskDto.setIs_get_pause(IOSConstant.ZERO); acsTaskDto.setIs_put_pause(IOSConstant.ZERO); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java index bb946e5..e6bfe97 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/enums/IOSConstant.java @@ -47,6 +47,11 @@ public class IOSConstant { */ public final static String AGVZJZ001 = "AGVZJZ001"; + /** + * 拆盘机 + */ + public final static String CBJ01 = "CBJ01"; + /** * 手持-库存查询-类型类型下拉框- 内包材值 */ diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java index 964a3c7..7e015f1 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java @@ -108,7 +108,7 @@ public class VehicleOutServiceImpl implements VehicleOutService { ); if (ObjectUtil.isEmpty(attrList)) { - throw new BadRequestException("库内没有空载具"); + throw new BadRequestException("暂时没有可用的空载具"); } return attrList; } diff --git a/wms/nladmin-ui/src/views/login.vue b/wms/nladmin-ui/src/views/login.vue index d723e61..b8c2365 100644 --- a/wms/nladmin-ui/src/views/login.vue +++ b/wms/nladmin-ui/src/views/login.vue @@ -4,12 +4,12 @@

{{ title }}

- + - + @@ -74,8 +74,8 @@ export default { codeUrl: '', cookiePass: '', loginForm: { - username: 'admin', - password: '123456', + username: '', + password: '', rememberMe: false, code: '', uuid: '' diff --git a/wms/nladmin-ui/src/views/monitor/server/index.vue b/wms/nladmin-ui/src/views/monitor/server/index.vue index a1e9877..0cd6024 100644 --- a/wms/nladmin-ui/src/views/monitor/server/index.vue +++ b/wms/nladmin-ui/src/views/monitor/server/index.vue @@ -13,6 +13,9 @@ {{ $t('monitor.day') }}：{{ data.sys.day }} + + 系统版本：{{ "V1.0"}} + diff --git a/wms/nladmin-ui/src/views/wms/sch/task/index.vue b/wms/nladmin-ui/src/views/wms/sch/task/index.vue index 5aa5f98..07b7b7c 100644 --- a/wms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/wms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -201,8 +201,8 @@ - - + +