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 | 238 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 162 insertions(+), 76 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 7f4972a..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 @@ -3,19 +3,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.Cools; +import com.vincent.rsf.server.api.controller.params.TaskInParam; +import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto; +import com.vincent.rsf.server.api.service.WcsService; import com.vincent.rsf.server.manager.enums.*; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.utils.LocUtils; import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams; import com.vincent.rsf.server.manager.entity.*; -import com.vincent.rsf.server.manager.mapper.TaskItemMapper; +import com.vincent.rsf.server.manager.enums.LocType; import com.vincent.rsf.server.manager.mapper.TaskMapper; import com.vincent.rsf.server.manager.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vincent.rsf.server.manager.utils.LocManageUtil; import com.vincent.rsf.server.system.constant.SerialRuleCode; -import com.vincent.rsf.server.system.enums.LocStsType; +import com.vincent.rsf.server.manager.enums.LocStsType; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import lombok.Synchronized; import org.apache.commons.lang3.StringUtils; @@ -68,6 +71,8 @@ private TaskService taskService; @Autowired private LocItemWorkingService locItemWorkingService; + @Autowired + private WcsService wcsService; @Override @Transactional(rollbackFor = Exception.class) @@ -97,8 +102,8 @@ } Task task = new Task(); task.setTaskCode(ruleCode) - .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue()) - .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue()) + .setTaskStatus(TaskStsType.GENERATE_IN.id) + .setTaskType(TaskType.TASK_TYPE_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.id) .setTargLoc(targetLoc) .setOrgSite(orgSta) @@ -183,8 +188,8 @@ } Task task = new Task(); task.setTaskCode(ruleCode) - .setTaskStatus(TaskStsType.COMPLETE_IN.id.shortValue()) - .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue()) + .setTaskStatus(TaskStsType.COMPLETE_IN.id) + .setTaskType(TaskType.TASK_TYPE_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_PLAT.id) .setTargLoc(targetLoc) .setBarcode(pakin.getBarcode()) @@ -290,8 +295,8 @@ } Task task = new Task(); task.setTaskCode(ruleCode) - .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue()) - .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue()) + .setTaskStatus(TaskStsType.GENERATE_IN.id) + .setTaskType(TaskType.TASK_TYPE_IN.type) .setTargLoc(targetLoc) .setBarcode(pakin.getBarcode()) .setOrgSite(deviceSite.getSite()) @@ -372,6 +377,31 @@ } /** + * 鍏ュ簱浠诲姟 + * + * @param tasks + * @throws Exception + */ + @Synchronized + @Override + @Transactional(rollbackFor = Exception.class) + public void complateInTask(List<Task> tasks) throws Exception { + for (Task task : tasks) { + if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) { + //1.鍏ュ簱 + complateInstock(task); + } 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); + } + } + } + + + /** * 瀹屾垚浠诲姟 鏇存柊搴撲綅鏄庣粏淇℃伅锛屽皢鍗曟嵁搴撳瓨鏇存柊鍒板崟鎹簱瀛樿〃 * * @param tasks @@ -383,26 +413,15 @@ public void completeTask(List<Task> tasks) throws Exception { for (Task task : tasks) { //鍑哄簱浠诲姟 - if (task.getTaskType() < TaskType.TASK_TYPE_OUT.type) { - if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) { - //1.鍏ュ簱 - complateInstock(task); - } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) { - //53.鎷f枡鍐嶅叆搴� - pickComplateInStock(task); - } - } else { - //鍑哄簱浠诲姟 - if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) { - //鍏ㄦ墭鍑哄簱 - complateOutStock(task); - } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) { - //鎷f枡鍑哄簱 - // - pickTask(task.getId()); - //绉婚櫎鍘熷搴撳瓨 - complateOutStock(task); - } + if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) { + //鍏ㄦ墭鍑哄簱 + complateOutStock(task); + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) { + //鎷f枡鍑哄簱 + complateOutStock(task); + } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) { + //鐩樼偣鍑哄簱 + complateOutStock(task); } } } @@ -440,31 +459,46 @@ LocItem locItem = new LocItem(); LocItemWorking locWorking = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>() .eq(LocItemWorking::getTaskId, taskItem.getTaskId()) - .eq(LocItemWorking::getLocCode, task.getTargLoc()) - .eq(LocItemWorking::getMatnrId, taskItem.getMatnrId()) - .eq(StringUtils.isNoneBlank(taskItem.getFieldsIndex()), LocItemWorking::getFieldsIndex, taskItem.getFieldsIndex()) - .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItemWorking::getBatch, taskItem.getBatch())); + .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItemWorking::getBatch, taskItem.getBatch()) + .eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItemWorking::getFieldsIndex, taskItem.getFieldsIndex()) + .eq(LocItemWorking::getMatnrId, taskItem.getMatnrId())); 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); } - if (!locItemService.saveBatch(items)) { - throw new CoolException("浣滀笟搴撳瓨鍥炲啓澶辫触锛侊紒"); - } + if (!locItemService.saveBatch(items)) { + throw new CoolException("浣滀笟搴撳瓨鍥炲啓澶辫触锛侊紒"); + } - if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) { - throw new CoolException("浣滀笟涓簱瀛樺垹闄ゅけ璐ワ紒锛�"); - } + TaskItem taskItem = taskItems.stream().findFirst().get(); + //淇濆瓨鍏ュ嚭搴撴祦姘� + saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType()); + + + if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) { + throw new CoolException("浣滀笟涓簱瀛樺垹闄ゅけ璐ワ紒锛�"); + } + + task.setTaskStatus(TaskStsType.UPDATED_IN.id); + + if (!taskService.updateById(task)) { + throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } } @@ -476,7 +510,7 @@ */ @Override public R removeTask(Long[] ids) { - List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); + List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Task> tasks = this.list(new LambdaQueryWrapper<Task>().in(Task::getId, ids).in(Task::getTaskStatus, longs)); if (tasks.isEmpty()) { throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�"); @@ -507,23 +541,23 @@ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, task.getOrgSite()) - .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type) + .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) ) { basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, task.getTargLoc()) - .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type) + .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type) ); } if (null == basStation) { throw new CoolException("绔欑偣鐘舵�侀敊璇紒锛�"); } - basStation.setUseStatus(StaUseStatusType.TYPE_F.type); + basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type); if (!basStationService.updateById(basStation)) { throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐ワ紒锛�"); } @@ -544,13 +578,26 @@ */ @Override @Transactional(rollbackFor = Exception.class) - public R 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>() @@ -559,35 +606,39 @@ throw new CoolException("娌℃湁绌哄簱浣嶏紒锛�"); } - List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId())); - if (locItems.isEmpty()) { - throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�"); - } - 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(type) + .setLocType1(Integer.parseInt(loc.getType())); + InTaskMsgDto locInfo = wcsService.getLocNo(param); + + if (Objects.isNull(locInfo)) { + throw new CoolException("鑾峰彇搴撲綅澶辫触锛侊紒"); + } + task.setTargLoc(locInfo.getLocNo()); + if (!this.updateById(task)) { throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�"); } - //TODO 鍚庣画闇�鏍规嵁浠撳簱绫诲瀷鏌ユ壘鏂板簱浣嶏紝鍘熷搴撲綅缃┖闂茬姸鎬� - List<LocItemWorking> workings = new ArrayList<>(); - for (LocItem item : locItems) { - LocItemWorking working = new LocItemWorking(); - BeanUtils.copyProperties(item, working); - working.setId(null).setTaskId(task.getId()); - workings.add(working); + Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())); + if (Objects.isNull(one)) { + throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�"); } + one.setUseStatus(LocStsType.LOC_STS_TYPE_S.type); - if (!locItemWorkingService.saveBatch(workings)) { - throw new CoolException("涓存椂搴撳瓨淇濆瓨澶辫触锛侊紒"); + if (!locService.updateById(one)) { + throw new CoolException("搴撲綅棰勭害鍏ュ簱澶辫触锛侊紒"); } - - return R.ok("鎷h揣鎴愬姛锛侊紒"); + return task; } /** @@ -614,10 +665,29 @@ if (taskItems.isEmpty()) { throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�"); } + + List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId())); + if (locItems.isEmpty()) { + throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�"); + } + + List<LocItemWorking> workings = new ArrayList<>(); + for (LocItem item : locItems) { + LocItemWorking working = new LocItemWorking(); + BeanUtils.copyProperties(item, working); + working.setId(null).setTaskId(task.getId()).setLocItemId(item.getId()); + workings.add(working); + } + + if (!locItemWorkingService.saveBatch(workings)) { + throw new CoolException("涓存椂搴撳瓨淇濆瓨澶辫触锛侊紒"); + } + try { //鏇存柊搴撲綅鏄庣粏 subtractLocItem(loc); } catch (Exception e) { + log.error("<UNK>", e); throw new CoolException(e.getMessage()); } @@ -650,12 +720,27 @@ } /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/ - if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, loc.getId()))) { + if (!locService.update(new LambdaUpdateWrapper<Loc>() + .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) + .eq(Loc::getId, loc.getId()))) { throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } - if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) { - throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + + 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("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�"); + } + } + } /** @@ -757,7 +842,7 @@ List<TaskItem> items = orderMap.get(key); try { //淇濆瓨搴撳瓨鏄庣粏 - saveStockItems(items, pakinItem); + saveStockItems(items, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType()); //绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵�� removeReceiptStock(pakinItem); } catch (Exception e) { @@ -844,19 +929,20 @@ * @return */ @Transactional(rollbackFor = Exception.class) - public void saveStockItems(List<TaskItem> items, WaitPakinItem order) 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)) { throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒"); } double sum = items.stream().mapToDouble(TaskItem::getAnfme).sum(); - stock.setSourceId(order.getId()) + stock.setSourceId(id) .setCode(ruleCode) - .setSourceCode(order.getAsnCode()) + .setSourceCode(code) .setAnfme(sum) - .setWkType(order.getWkType()) - .setType(order.getType()); + .setWkType(wkType) + .setType(type); if (!stockService.save(stock)) { throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒"); } -- Gitblit v1.9.1