From 8c39eb09386b96d0256695b3de3d2822e95809f0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 七月 2025 10:23:30 +0800 Subject: [PATCH] 盘点单下发功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java index dd29375..42daaa4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java @@ -89,8 +89,8 @@ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception { WkOrder orders = params.getOrders(); params.getItems().forEach(item -> { - item.put("asnId", orders.getId()); - item.put("asnCode", orders.getCode()); + item.put("orderId", orders.getId()); + item.put("orderCode", orders.getCode()); item.put("poCode", orders.getPoCode()); item.put("createBy", loginUserId); item.put("updateBy", loginUserId); @@ -99,7 +99,7 @@ } }); List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() - .eq(WkOrderItem::getAsnId, params.getOrders().getId())); + .eq(WkOrderItem::getOrderId, params.getOrders().getId())); Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum(); orders.setAnfme(sum); if (!this.updateById(orders)) { @@ -129,7 +129,7 @@ throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒"); } - List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id)); + List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id)); if (!orderItems.isEmpty()) { for (WkOrderItem orderItem : orderItems) { if (!Objects.isNull(orderItem.getPoDetlId())) { @@ -155,7 +155,7 @@ if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) { throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒"); } - if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id))) { + if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id))) { throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒"); } return R.ok("鎿嶄綔鎴愬姛"); @@ -221,8 +221,8 @@ .setFieldsIndex(item.getFieldsIndex()) .setAnfme(item.getAnfme()) .setWorkQty(0.0) - .setAsnId(order.getId()) - .setAsnCode(order.getCode()) + .setOrderId(order.getId()) + .setOrderCode(order.getCode()) .setStockUnit(item.getUnit()) .setPurUnit(item.getUnit()) .setPlatWorkCode(item.getPlatWorkCode()) @@ -306,7 +306,7 @@ List<Long> list = orders.stream().map(WkOrder::getId).collect(Collectors.toList()); List<WkOrderItem> orderItems = asnOrderItemService .list(new LambdaQueryWrapper<WkOrderItem>() - .in(WkOrderItem::getAsnId, list).apply("anfme > work_qty")); + .in(WkOrderItem::getOrderId, list).apply("anfme > work_qty")); if (orderItems.isEmpty()) { throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); } @@ -338,7 +338,7 @@ items.forEach(orderItem -> { WaveOrderRela orderRela = new WaveOrderRela(); orderRela.setId(null) - .setOrderId(orderItem.getAsnId()) + .setOrderId(orderItem.getOrderId()) .setOrderItemId(orderItem.getId()) .setWaveId(wave.getId()) .setWaveItemId(item.getId()); @@ -486,7 +486,7 @@ LocItem locItem = locItemService.getById(param.getId()); WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>() - .eq(WkOrderItem::getAsnId, outId) + .eq(WkOrderItem::getOrderId, outId) .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch()) .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex()) .eq(WkOrderItem::getMatnrId, locItem.getMatnrId())); @@ -498,7 +498,7 @@ locItem.setOutQty(param.getOutQty()) .setBatch(param.getBatch()) .setSourceId(outId) - .setSourceCode(orderItem.getAsnCode()) + .setSourceCode(orderItem.getOrderCode()) .setSource(orderItem.getId()); locItems.add(locItem); @@ -562,7 +562,7 @@ @Override @Transactional(rollbackFor = Exception.class) public R cancelOutOrderByItems(List<WkOrderItem> orderItems) { - Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getAsnId)); + Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId)); for (Long key : listMap.keySet()) { WkOrder order = this.getById(key); if (Objects.isNull(order)) { @@ -593,7 +593,7 @@ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒"); } if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>() - .eq(WkOrderItem::getAsnId, key))) { + .eq(WkOrderItem::getOrderId, key))) { throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒"); } } @@ -603,7 +603,7 @@ private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) { List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() - .eq(WkOrderItem::getAsnId, orderId)); + .eq(WkOrderItem::getOrderId, orderId)); List<OrderOutItemDto> list = new ArrayList<>(); Set<ExistDto> existDtos = new HashSet<>(); for (WkOrderItem wkOrderItem : wkOrderItems) { -- Gitblit v1.9.1