From ab3b19838d7c2cb71866279ea64f8d9b7998df8e Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Dec 2024 13:41:57 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=8C=81=E8=BD=AC=E8=BF=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/common/enums/StatusEnum.java | 3 ++- .../devicemanage/DeviceManageController.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index d7d1b678..9a9bf349 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -35,12 +35,13 @@ public enum StatusEnum { IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20","outStorageTask","生产出库", "21","outStorageTask", "调拨出库", "22","outStorageTask","拣选出库", "23","conveyorOutStorageTask","盘点出库", "24","outStorageTask","出库拣选", "25","toPickPlatformTask","托盘出库", "40","outStorageTask")), IOBILL_TYPE_MOVE(ForkMap.of("移库", "50","moveStorageTask","异常位移库", "51","moveStorageTask")), EXT_TASK_TYPE(ForkMap.of("盘点", "60","moveStorageTask")), + OTHER_TASK_TYPE(ForkMap.of("转运", "70","tranforTask")), profit_loss(ForkMap.of("盘亏", "0",null,"盘盈", "1",null,"实盘", "2",null)), /** * 任务类型 */ - TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code,IOBILL_TYPE_MOVE.code,EXT_TASK_TYPE.code)), + TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code,IOBILL_TYPE_MOVE.code,EXT_TASK_TYPE.code,OTHER_TASK_TYPE.code)), ACS_TYPE(ForkMap.of("立库", "10",null ,"海柔", "20",null diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java index a8888017..bee7be90 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java @@ -2,6 +2,7 @@ package org.nl.wms.pda_manage.devicemanage; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,11 +11,18 @@ import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.domain.exception.handler.ApiError; +import org.nl.common.enums.StatusEnum; +import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; +import org.nl.wms.dispatch_manage.task.handler.impl.TranforTask; +import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; +import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; import org.nl.wms.external_system.acs.service.AcsToWmsService; import org.nl.wms.external_system.acs.service.WmsToAcsService; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; @@ -55,6 +63,8 @@ public class DeviceManageController { private IBmVehicleInfoService iBmVehicleInfoService; @Autowired private IMdPbVehicleMaterService iMdPbVehicleMaterService; + @Autowired + private TranforTask tranforTask; /** * 切换出入库模式 @@ -135,6 +145,7 @@ public class DeviceManageController { @Log("转运确认") public ResponseEntity transfConfirm(@RequestBody JSONObject param) { // {"start":"1123","end":"1131"} + tranforTask.createTask(param); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); }