From 051b6750c2706a0bde067cb0695febbc0bcb8702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 1 Jun 2026 14:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8A=A0=E5=9B=BE=E7=89=87;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStockOutOrderApplicationService.java | 4 ++-- .../service/ReservationStockOutOrderDomainService.java | 3 ++- .../ReservationStockOutOrder/ReservationStockOutOrderApi.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 5503d5be8..f96c5e981 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -1294,7 +1294,7 @@ public class ReservationStockOutOrderApplicationService { reservationStockOutOrderMapper.updateById(entity); } - public void returnGoods(String invoiceNumber, String transportationNumber, String orderId) { - stockOutOrderDomainService.returnGoods(invoiceNumber, transportationNumber, orderId); + public void returnGoods(String invoiceNumber, String transportationNumber, String orderId,String pictureUrl) { + stockOutOrderDomainService.returnGoods(invoiceNumber, transportationNumber, orderId, pictureUrl); } } \ No newline at end of file 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 16fe40cbb..357771299 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 @@ -730,7 +730,7 @@ public class ReservationStockOutOrderDomainService { return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDO); } - public void returnGoods(String invoiceNumber, String transportationNumber, String orderId) { + public void returnGoods(String invoiceNumber, String transportationNumber, String orderId,String pictureUrl) { reservationStockInOrderMapper.updateByOrderId(orderId); reservationStockInOrderMapper.updateByTransportationNumber(transportationNumber); LoginUser loginUser = SecurityUtils.getLoginUser(); @@ -750,6 +750,7 @@ public class ReservationStockOutOrderDomainService { ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false); if (stockOutOrder != null) { ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); + reservationStockInOrder.setPictureUrl(pictureUrl); reservationStockInOrder.setOrganizationId(stockOutOrder.getOrganizationId()); reservationStockInOrder.setOrganizationName(stockOutOrder.getOrganizationName()); reservationStockInOrder.setTopOrganizationId(stockOutOrder.getTopOrganizationId()); diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java index 549a5fcf1..f20f82bad 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java @@ -202,11 +202,11 @@ public class ReservationStockOutOrderApi extends BaseController { @ApiOperation("退货") @GetMapping("/returnGoods") - public AjaxResult returnGoods(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("transportationNumber") String transportationNumber, @RequestParam("orderId") String orderId) { + public AjaxResult returnGoods(@RequestParam("invoiceNumber") String invoiceNumber, @RequestParam("transportationNumber") String transportationNumber, @RequestParam("orderId") String orderId, @RequestParam("pictureUrl") String pictureUrl) { if (invoiceNumber == null || invoiceNumber.trim().isEmpty()) { return AjaxResult.error("发票编号不能为空"); } - stockOutOrderApplicationService.returnGoods(invoiceNumber, transportationNumber, orderId); + stockOutOrderApplicationService.returnGoods(invoiceNumber, transportationNumber, orderId, pictureUrl); return AjaxResult.success(); }