From 0b190d8a9aad67aa521ec163b437c59f6e63c400 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 14:04:27 +0800 Subject: [PATCH] 盘点单下发功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java index f803400..b29df72 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java @@ -9,6 +9,8 @@ import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; +import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams; +import com.vincent.rsf.server.manager.controller.params.CheckOrderParams; import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam; import com.vincent.rsf.server.manager.entity.*; import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate; @@ -231,10 +233,35 @@ @Override public R getAllLocByMatnr(List<String> matnrs) { List<LocItem> locItems = locItemService.listByMatnr(matnrs); - if (locItems.isEmpty()) { - return R.ok(); + if (!locItems.isEmpty()) { + List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_CHECK_IN.type); + DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>() + .in(DeviceSite::getType, list) + .groupBy(DeviceSite::getSite) + .last("limit 1")); + if (Objects.isNull(deviceSite)) { + throw new CoolException("搴撳彛涓嶄负绌猴紒锛�"); + } + locItems.forEach(locItem -> { + locItem.setSiteNo(deviceSite.getSite()); + }); } + return R.ok().add(locItems); + } + /** + * @author Ryan + * @date 2025/7/17 + * @description: 鐢熸垚鐩樼偣浠诲姟 + * @version 1.0 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R genCheckOutTask(List<CheckOrderParams> checkParams, Long loginUserId) { + if (checkParams.isEmpty()) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return null; } -- Gitblit v1.9.1