From 2eb34bee06677dcff810b843b6c2a0979e844422 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 30 五月 2025 17:04:41 +0800 Subject: [PATCH] 移库任务取消优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java index 6101454..aeb5791 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java @@ -41,8 +41,6 @@ @Autowired private DeviceSiteService deviceSiteService; @Autowired - private SlaveProperties slaveProperties; - @Autowired private WcsService wcsService; @@ -100,6 +98,7 @@ .setTaskCode(ruleCode) .setParentId(moveTask.getId()) .setTargSite(siteNo) + .setSort(Constants.TASK_SORT_DEFAULT_VALUE) .setUpdateBy(loginUserId) .setCreateBy(loginUserId) .setCreateTime(new Date()) @@ -158,12 +157,19 @@ } task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice()); - } if (!taskService.save(task)) { throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒"); } + + if (!Objects.isNull(moveTask.getId())) { + moveTask.setParentId(task.getId()); + if (!taskService.saveOrUpdate(moveTask)) { + throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒"); + } + } + List<TaskItem> taskItems = new ArrayList<>(); listMap.get(key).forEach(item -> { TaskItem taskItem = new TaskItem(); @@ -173,6 +179,9 @@ .setBatch(item.getBatch()) .setUpdateBy(loginUserId) .setCreateBy(loginUserId) + .setSource(item.getId()) + .setSourceId(item.getLocId()) + .setSourceCode(item.getLocCode()) .setCreateTime(new Date()) .setUpdateTime(new Date()) .setOrderType(OrderType.ORDER_OUT.type) @@ -229,11 +238,11 @@ throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒"); } - if (orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type) - || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) - || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_X.type ) ) { - throw new CoolException("婧愬簱浣嶆湁浠诲姟姝e湪鎵ц涓�..."); - } +// if (orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type) +// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) +// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_X.type ) ) { +// throw new CoolException("婧愬簱浣嶆湁浠诲姟姝e湪鎵ц涓�..."); +// } orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type); @@ -252,8 +261,10 @@ } TaskInParam param = new TaskInParam(); param.setIoType(TaskType.TASK_TYPE_OUT.type) + .setOrgLoc(map.getOrgLoc()) .setSourceStaNo(Integer.parseInt(deviceSite.getSite())) - .setLocType1(Integer.parseInt(orgLoc.getType())); + .setLocType1(Integer.parseInt(orgLoc.getType()) + ); InTaskMsgDto locNo = null; try { locNo = wcsService.getLocNo(param); @@ -283,8 +294,9 @@ .setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type) .setTargLoc(targetLoc.getCode()) .setUpdateBy(loginUserId) + .setSort(Constants.TASK_SORT_DEFAULT_VALUE) .setUpdateTime(new Date()) - .setTaskStatus(TaskStsType.GENERATE_IN.id) + .setTaskStatus(TaskStsType.GENERATE_OUT.id) .setBarcode(orgLoc.getBarcode()); if (!taskService.save(task)) { @@ -301,9 +313,12 @@ .setAnfme(item.getAnfme()) .setBatch(item.getBatch()) .setUpdateBy(loginUserId) + .setSourceId(item.getLocId()) + .setSourceCode(item.getLocCode()) + .setSource(item.getId()) .setUpdateTime(new Date()) - .setOrderType(OrderType.ORDER_IN.type) - .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)); + .setOrderType(OrderType.ORDER_OUT.type) + .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)); taskItems.add(taskItem); } if (!taskItemService.saveBatch(taskItems)) { -- Gitblit v1.9.1