From 093c43638d3f9aa64fc3b396a0a2452cc28abbe3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 23 五月 2025 18:59:39 +0800 Subject: [PATCH] 生成移库任务 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 68 +++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 21 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index ac780a4..d6484af 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java @@ -393,6 +393,9 @@ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) { //53.鎷f枡鍐嶅叆搴� pickComplateInStock(task); + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { + //57.鐩樼偣鍐嶅叆搴� + pickComplateInStock(task); } } } @@ -413,10 +416,11 @@ if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) { //鍏ㄦ墭鍑哄簱 complateOutStock(task); - } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) { + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) { //鎷f枡鍑哄簱 -// Task seviceOne = pickTask(task.getId()); - //绉婚櫎鍘熷搴撳瓨 + complateOutStock(task); + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) { + //鐩樼偣鍑哄簱 complateOutStock(task); } } @@ -461,12 +465,17 @@ if (Objects.isNull(locWorking)) { throw new CoolException("鏁版嵁閿欒锛屼綔涓氫腑搴撳瓨鏁版嵁涓㈠け锛侊紒"); } - if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) { - locWorking.setAnfme(Math.round((locWorking.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0); + if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { + locWorking.setWorkQty(0.0); + locWorking.setAnfme(taskItem.getAnfme()); } else { - continue; + if (locWorking.getAnfme().compareTo(taskItem.getAnfme()) >= 0) { + locWorking.setWorkQty(0.0); + locWorking.setAnfme(Math.round((locWorking.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0); + } else { + continue; + } } - BeanUtils.copyProperties(locWorking, locItem); locItem.setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null); items.add(locItem); @@ -535,7 +544,7 @@ .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type) ); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type) - || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type) + || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type) @@ -569,13 +578,26 @@ */ @Override @Transactional(rollbackFor = Exception.class) - public Task pickTask(Long id) throws Exception { + public Task pickOrCheckTask(Long id, String oType) throws Exception { Task task = this.getById(id); if (Objects.isNull(task)) { throw new CoolException("褰撳墠浠诲姟涓嶅瓨鍦紒锛�"); } - if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) { - throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒"); + Integer type; + if (oType.equals("check")) { + //鐩樼偣鍏ュ簱 + type = TaskType.TASK_TYPE_CHECK_IN.type; + + if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) { + throw new CoolException("闈炵洏鐐瑰嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒"); + } + } else { + //鎷f枡鍏ュ簱 + type = TaskType.TASK_TYPE_PICK_IN.type; + + if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) { + throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒"); + } } Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>() @@ -587,13 +609,14 @@ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, task); //鏇存柊浠诲姟涓诲崟 task.setTaskCode(ruleCode) - .setTaskType(TaskType.TASK_TYPE_PICK_IN.type) + .setTaskType(type) .setBarcode(task.getBarcode()) .setTaskStatus(TaskStsType.GENERATE_IN.id); + //TODO 鏍规嵁鐗╂枡鐨勫簱浣嶇被鍨嬬敓鎴愭柊鐨勫簱浣� TaskInParam param = new TaskInParam(); param.setSourceStaNo(Integer.parseInt(task.getTargSite())) - .setIoType(Integer.parseInt(TaskType.TASK_TYPE_PICK_IN.type + "")) + .setIoType(type) .setLocType1(Integer.parseInt(loc.getType())); InTaskMsgDto locInfo = wcsService.getLocNo(param); @@ -664,6 +687,7 @@ //鏇存柊搴撲綅鏄庣粏 subtractLocItem(loc); } catch (Exception e) { + log.error("<UNK>", e); throw new CoolException(e.getMessage()); } @@ -702,18 +726,19 @@ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } - if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) { - if (!this.update(new LambdaUpdateWrapper<Task>() - .eq(Task::getId, task.getId()) - .set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) { - throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); - } - } else { + if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) { if (!this.update(new LambdaUpdateWrapper<Task>() .eq(Task::getId, task.getId()) .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) { throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); } + } else { + if (!this.update(new LambdaUpdateWrapper<Task>() + .eq(Task::getId, task.getId()) + .set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) { + throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); + } + } } @@ -904,7 +929,8 @@ * @return */ @Transactional(rollbackFor = Exception.class) - public void saveStockItems(List<TaskItem> items, Long id, String code, Short wkType, String type) throws Exception { + public void saveStockItems(List<TaskItem> items, Long id, String code, Short wkType, String type) throws + Exception { Stock stock = new Stock(); String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null); if (StringUtils.isBlank(ruleCode)) { -- Gitblit v1.9.1