From 703de2d3af4fa171c057f7840dce221e79fa2912 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 15 Oct 2024 10:29:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8B=E8=BD=BD=E6=9C=AC=E5=9C=B0=E5=8D=95?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderService.java | 56 +------------------ 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index fe8f003f7..6e13e0577 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -227,7 +227,6 @@ public class IoCollectOrderService extends ServiceImpl list = orderService.filterList(filterOrderRequest); - List collectOrderList = new ArrayList<>(); - List allWorksList = new ArrayList<>(); for (IoOrderResponse ioOrderEntity : list) { if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, ioOrderEntity.getBillNo()))) { @@ -271,39 +268,11 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaces = sysWorkplaceService.getAllByBusType(ioOrderEntity.getAction()); - - //自动分配工位 - final Long[] defaultWorkplace = {null}; - if (CollUtil.isNotEmpty(sysWorkplaces)) { - if (sysWorkplaces.size() == 1) { - defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); - } else { - List addWorkplace = new ArrayList<>(); - for (SysWorkplaceResponse sysWorkplace : sysWorkplaces) { - //获取是否有正在处理的工位 - List collectOrderList1 = collectOrderMapper.selectList(new LambdaQueryWrapper() - .eq(IoCollectOrder::getWorkPlaceCode, sysWorkplace.getWorkplaceId()).in(IoCollectOrder::getTagStatus, -1, 1, 2)); - sysWorkplace.setOrderCount(collectOrderList1.size()); - if (IntUtil.value(sysWorkplace.getOrderCount()) > 0) { - addWorkplace.add(sysWorkplace); - } - } - if (addWorkplace.size() > 0) { - Optional minCountObject = addWorkplace.stream() - .min((o1, o2) -> Integer.compare(o1.getOrderCount(), o2.getOrderCount())); - minCountObject.ifPresent(sysWorkplace -> defaultWorkplace[0] = sysWorkplace.getWorkplaceId()); - } else { - defaultWorkplace[0] = sysWorkplaces.get(0).getWorkplaceId(); - } - } - } IoCollectOrder collectOrder = IoCollectOrder.builder() .billNo(ioOrderEntity.getBillNo()) .fromType("UDI系统") .busType(ioOrderEntity.getAction()) .fromCorp(ioOrderEntity.getFromName()) - .workPlaceCode(defaultWorkplace[0]) .billTime(ioOrderEntity.getCreateTime()) .createTime(ioOrderEntity.getCreateTime()) .createUser(ioOrderEntity.getCreateUser()) @@ -317,7 +286,6 @@ public class IoCollectOrderService extends ServiceImpl orderDetailBizEntities = orderDetailBizService.findByOrderId(ioOrderEntity.getBillNo()); - List collectOrderBizs = new ArrayList<>(); for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getBindRlFk() + ""); @@ -346,25 +314,7 @@ public class IoCollectOrderService extends ServiceImpl sysWorkplaceMap = new HashMap<>(); -// for (SysWorkplaceResponse sysWorkplace : allWorksList) { -// sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace); -// } -// for (SysWorkplaceResponse value : sysWorkplaceMap.values()) { -// splitFifoCodeService.preAllotInv(value.getWorkplaceId()); -// } - }