From af455bd20edfd02cb3e8c7710e65aee798720dca Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 14 四月 2025 17:25:40 +0800 Subject: [PATCH] #新增 1. 生成任务新增站点选择功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 197 insertions(+), 2 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 3cfa531..cc757b4 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 @@ -1,12 +1,207 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.vincent.rsf.server.api.entity.enums.OrderType; +import com.vincent.rsf.server.api.entity.enums.TaskStsType; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.api.entity.enums.TaskType; +import com.vincent.rsf.server.manager.entity.*; +import com.vincent.rsf.server.manager.enums.PakinIOStatus; import com.vincent.rsf.server.manager.mapper.TaskMapper; -import com.vincent.rsf.server.manager.entity.Task; -import com.vincent.rsf.server.manager.service.TaskService; +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.system.utils.SerialRuleUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Service("taskService") public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService { + @Autowired + private WaitPakinService waitPakinService; + @Autowired + private TaskItemService taskItemService; + @Autowired + private WaitPakinItemService waitPakinItemService; + @Autowired + private LocService locService; + @Autowired + private PurchaseService purchaseService; + @Autowired + private AsnOrderService asnOrderService; + @Autowired + private AsnOrderItemService asnOrderItemService; + @Autowired + private StockService stockService; + @Autowired + private StockItemService stockItemService; + + + + /** + * @param + * @param loginUserId + * @return + * @author Ryan + * @description 鐢熸垚浠诲姟鍒楄〃 + * @time 2025/3/29 15:59 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public synchronized R generateTasks(List<WaitPakin> waitPakin, Long loginUserId) { + if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + /**鑾峰彇缁勬嫋*/ + List<Long> ids = waitPakin.stream().map(WaitPakin::getId).collect(Collectors.toList()); + List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>() + .in(WaitPakin::getId, ids) + .eq(WaitPakin::getIoStatus, Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))); + if (waitPakins.isEmpty()) { + throw new CoolException("璇锋鏌ョ粍鎷栫姸鎬佹槸鍚﹀畬鎴愶紒锛�"); + } + waitPakins.forEach(pakin -> { + List<TaskItem> taskItems = new ArrayList<>(); + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null); + if (StringUtils.isBlank(ruleCode)) { + throw new CoolException("缂栫爜閿欒锛氳纭缂栫爜銆孲YS_TASK_CODE銆嶆槸鍚﹀凡鐢熸垚!!"); + } + Task task = new Task(); + task.setTaskCode(ruleCode) + .setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue()) + .setTaskType(TaskType.TASK_TYPE_IN.type.shortValue()) + .setTargLoc(LocManageUtil.getTargetLoc()) + .setBarcode(pakin.getBarcode()) + .setCreateBy(loginUserId) + .setUpdateBy(loginUserId) + .setTargSite(LocManageUtil.getTargetSite()); + + if (!this.save(task)) { + throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒"); + } + if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()) + .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, pakin.getBarcode()))) { + throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒"); + } + /**鑾峰彇缁勬嫋鏄庣粏**/ + List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId())); + if (waitPakinItems.isEmpty()) { + throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪"); + } + waitPakinItems.forEach(item -> { + TaskItem taskItem = new TaskItem(); + BeanUtils.copyProperties(item, taskItem); + taskItem.setTaskId(task.getId()) + .setOrderType(OrderType.ORDER_RECEIPT.type) + .setSource(item.getId()) + .setTrackCode(item.getTrackCode()) + .setCreateBy(loginUserId) + .setUpdateBy(loginUserId) + .setOrderId(item.getAsnId()) + .setOrderItemId(item.getAsnItemId()); + taskItems.add(taskItem); + }); + if (!taskItemService.saveBatch(taskItems)) { + throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); + + if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>() + .in(WaitPakin::getId, ids) + .set(WaitPakin::getUpdateBy, loginUserId) + .set(WaitPakin::getCreateBy, loginUserId) + .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_EXCE.val))) { + throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } + return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�"); + } + + /** + * 瀹屾垚浠诲姟 + * @param tasks + * @throws Exception + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void completeTask(List<Task> tasks) throws Exception { + if (tasks.isEmpty()) { + return; + } + List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList()); + List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list)); + if (taskItems.isEmpty()) { + throw new CoolException("浠诲姟鏄庣粏涓嶈兘涓虹┖锛侊紒"); + } + /**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/ + Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId)); + List<StockItem> stockItems = new ArrayList<>(); + orderMap.keySet().forEach(key -> { + AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>() + .eq(AsnOrder::getId, key) + .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode)); + Stock stock = new Stock(); + if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) { + Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode())); + if (!Objects.isNull(purchase)) { + stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId()); + } + } + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null); + if (StringUtils.isBlank(ruleCode)) { + throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒"); + } + stock.setAsnId(order.getId()).setAsnCode(order.getCode()); + if (!stockService.save(stock)) { + throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒"); + } + List<TaskItem> items = orderMap.get(key); + for (TaskItem item : items) { + /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/ + Task taskServiceOne = this.getOne(new LambdaQueryWrapper<Task>() + .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode) + .eq(Task::getId, item.getTaskId())); + Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc())); + if (Objects.isNull(loc)) { + throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�"); + } + AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId())); + if (Objects.isNull(orderItem)) { + throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); + } + StockItem stockItem = new StockItem(); + BeanUtils.copyProperties(orderItem, stockItem); + stockItem.setAsnItemId(item.getOrderItemId()) + .setBarcode(taskServiceOne.getBarcode()) + .setLocId(loc.getId()) + .setId(null) + .setStockId(stock.getId()); + stockItems.add(stockItem); + } + if (!stockItemService.saveBatch(stockItems)) { + throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�"); + } + }); + /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/ + List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList()); + if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) { + throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } + if (!this.update(new LambdaUpdateWrapper<Task>().set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) { + throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } + } } -- Gitblit v1.9.1