From ac09ee9c9f39cb9d452b57504e5c79321e0371eb Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期四, 03 四月 2025 15:34:34 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java index a666960..b1e3cf3 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/OpenUtils.java @@ -399,7 +399,7 @@ task.setTaskCtg(taskCtg.getId()); task.setPriority(priority); task.setOriginSite(null); - task.setOriginLoc(null); + task.setOriginLoc(shuttleProtocol.getCurrentLocNo()); task.setDestSite(null); task.setDestLoc(param.getDestLoc()); task.setIoTime(new Date()); @@ -435,4 +435,52 @@ return R.ok(); } + public R createLadenMoveTakeTask(CreateManualTakeTaskParam param) { + //鑾峰彇鎵嬪姩浠诲姟绫诲瀷 + TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>() + .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.MOVE)) + .eq(TaskCtg::getStatus, 1)); + if (taskCtg == null) { + return R.error("浠诲姟绫诲瀷寮傚父"); + } + + Task one = taskService.getOne(new LambdaQueryWrapper<Task>() + .eq(Task::getTaskCtg, taskCtg.getId()) + .eq(Task::getOriginLoc, param.getOriginLoc()) + .eq(Task::getDestLoc, param.getDestLoc())); + if (one != null) { + return R.error("浠诲姟宸插瓨鍦�"); + } + + //浼樺厛绾� + Integer priority = 10; + if (param.getPriority() != null) { + priority = param.getPriority(); + } + + Task task = new Task(); + task.setUuid(String.valueOf(snowflakeIdWorker.nextId())); + task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT"))); + task.setWmsTaskNo(param.getTaskNo()); + task.setTaskSts(TaskStsType.NEW_LADEN_MOVE.sts); + task.setTaskCtg(taskCtg.getId()); + task.setPriority(priority); + task.setOriginSite(null); + task.setOriginLoc(param.getOriginLoc());//婧愬簱浣� + task.setDestSite(null); + task.setDestLoc(param.getDestLoc());//鐩爣搴撲綅 + task.setIoTime(new Date()); + task.setStartTime(new Date()); + task.setStatus(1); + task.setMemo(""); + task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞� + task.setRecordLoc(param.getRecord() ? "Y" : "N");//璁板綍搴撳瓨淇℃伅 + task.setHostId(1L);//涓存椂鎺у埗鍙厑璁竓ost涓�1 + + boolean result = taskService.save(task); + if (!result) { + return R.error("鐢熸垚鎵嬪姩鍙栨斁璐т换鍔″け璐ワ紒"); + } + return R.ok(); + } } -- Gitblit v1.9.1