diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index 2f2ea9591..44980264c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -328,15 +328,15 @@ public class ReservationStockOutOrderDomainService { BeanUtils.copyProperties(byId, stockOutOrder,"outOrderId"); wmsServiceFeign.omsOutOrderAdd(stockOutOrder); -// List list = deliveryDetailsLinkService.list(new QueryWrapper().lambda().eq(ReservationDeliveryDetailsLink::getOrderNumber, byId.getOutOrderNumber())); -// List deliveryDetailsLinkList = new ArrayList<>(); -// for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : list) { -// DeliveryDetailsLink deliveryDetailsLink = new DeliveryDetailsLink(); -// BeanUtils.copyProperties(reservationDeliveryDetailsLink, deliveryDetailsLink,"id"); -// deliveryDetailsLink.setOmsId(reservationDeliveryDetailsLink.getId()); -// deliveryDetailsLinkList.add(deliveryDetailsLink); -// } -// wmsServiceFeign.omsOutOrderAddDeliveryDetailsLink(deliveryDetailsLinkList); + List list = deliveryDetailsLinkService.list(new QueryWrapper().lambda().eq(ReservationDeliveryDetailsLink::getOrderNumber, byId.getOutOrderNumber())); + List deliveryDetailsLinkList = new ArrayList<>(); + for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : list) { + DeliveryDetailsLink deliveryDetailsLink = new DeliveryDetailsLink(); + BeanUtils.copyProperties(reservationDeliveryDetailsLink, deliveryDetailsLink,"id"); + deliveryDetailsLink.setOmsId(reservationDeliveryDetailsLink.getId()); + deliveryDetailsLinkList.add(deliveryDetailsLink); + } + wmsServiceFeign.omsOutOrderAddDeliveryDetailsLink(deliveryDetailsLinkList); String inOrderNumber = stockOutOrder.getOutOrderNumber(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 26ef33438..af5555e23 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -223,8 +223,8 @@ public class StockOutOrderApplicationService { for (StockOutOrderPO stockOutOrderPO : stockOutOrderPOS) { String outOrderNumber = stockOutOrderPO.getOutOrderNumber(); -// List list = deliveryDetailsLinkService.list(new LambdaQueryWrapper().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber)); -// stockOutOrderPO.setDeliveryDetailsLinkList(list); + List list = deliveryDetailsLinkService.list(new LambdaQueryWrapper().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber)); + stockOutOrderPO.setDeliveryDetailsLinkList(list); OutStockListMaterialAgg mag = materialAggByNum.get(outOrderNumber); BigDecimal reduce = (mag != null && mag.getTotalOutboundQuantity() != null)