From 784ad7929d17ae383794abb5ec4c461943ec684a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 27 May 2026 15:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BB=96=E5=A5=B6=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationDeliveryDetailsLink.java | 2 + .../entity/ReservationStockOutOrder.java | 15 ++++ .../po/ReservationStockOutOrderPO.java | 16 ++++ .../todo/ReservationStockOutOrderDO.java | 16 ++++ .../todo/ReservationStockOutOrderDTO.java | 16 ++++ ...vationStockOutOrderApplicationService.java | 4 + ...ReservationStockOutOrderDomainService.java | 85 +++++++++++-------- .../SysTableConfigServiceImpl.java | 1 + .../ReservationStockOutOrderApi.java | 33 +++---- 9 files changed, 132 insertions(+), 56 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationDeliveryDetailsLink/entity/ReservationDeliveryDetailsLink.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationDeliveryDetailsLink/entity/ReservationDeliveryDetailsLink.java index fca897dbc..9aeb5fc53 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationDeliveryDetailsLink/entity/ReservationDeliveryDetailsLink.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationDeliveryDetailsLink/entity/ReservationDeliveryDetailsLink.java @@ -23,6 +23,8 @@ public class ReservationDeliveryDetailsLink extends BaseVOEntity { private Long orderId; @ApiModelProperty(value = "业务单号") private String orderNumber; + @ApiModelProperty(value = "退货入库单号") + private String returnOrderNumber; @ApiModelProperty(value = "类别") private String category; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java index 5108cb606..96c046548 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java @@ -463,4 +463,19 @@ public class ReservationStockOutOrder extends BaseVOEntity { @ApiModelProperty("路线") private String route; + @ApiModelProperty(value = "发票编号") + private String invoiceNumber; + + @ApiModelProperty(value = "客户编号") + private String customerNumber; + + @ApiModelProperty(value = "配送名称") + private String deliveryName; + + @ApiModelProperty(value = "退货入库单号") + private String returnOrderNumber; + @ApiModelProperty("退货数量") + @Excel(name = "退货数量") + private BigDecimal returnQuantity; + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java index 4099c5ba4..55137e56c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java @@ -475,5 +475,21 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { private BigDecimal totalAmount; @ApiModelProperty("路线") private String route; + + + @ApiModelProperty(value = "发票编号") + private String invoiceNumber; + + @ApiModelProperty(value = "客户编号") + private String customerNumber; + + @ApiModelProperty(value = "配送名称") + private String deliveryName; + + @ApiModelProperty(value = "退货入库单号") + private String returnOrderNumber; + @ApiModelProperty("退货数量") + @Excel(name = "退货数量") + private BigDecimal returnQuantity; private List reservationDeliveryDetailsLinkList; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index f9581b624..74c38dd1b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -510,4 +510,20 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { private BigDecimal totalAmount; @ApiModelProperty("路线") private String route; + + + @ApiModelProperty(value = "发票编号") + private String invoiceNumber; + + @ApiModelProperty(value = "客户编号") + private String customerNumber; + + @ApiModelProperty(value = "配送名称") + private String deliveryName; + + @ApiModelProperty(value = "退货入库单号") + private String returnOrderNumber; + @ApiModelProperty("退货数量") + @Excel(name = "退货数量") + private BigDecimal returnQuantity; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index cc6227fc8..2f64d5492 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -498,4 +498,20 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO private BigDecimal totalAmount; @ApiModelProperty("路线") private String route; + + + @ApiModelProperty(value = "发票编号") + private String invoiceNumber; + + @ApiModelProperty(value = "客户编号") + private String customerNumber; + + @ApiModelProperty(value = "配送名称") + private String deliveryName; + + @ApiModelProperty(value = "退货入库单号") + private String returnOrderNumber; + @ApiModelProperty("退货数量") + @Excel(name = "退货数量") + private BigDecimal returnQuantity; } \ No newline at end of file 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 50df5bd36..55e36b6b2 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 @@ -1229,4 +1229,8 @@ public class ReservationStockOutOrderApplicationService { } reservationStockOutOrderMapper.updateById(entity); } + + public void returnGoods(String invoiceNumber) { + stockOutOrderDomainService.returnGoods(invoiceNumber); + } } \ 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 e6820b77d..5ebd085c8 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 @@ -12,8 +12,12 @@ import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.oms.domain.businessDeliveryDetailsLink.entity.BusinessDeliveryDetailsLink; +import com.mhd.oms.domain.businessDeliveryDetailsLink.repository.facade.IBusinessDeliveryDetailsLinkService; import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder; import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; +import com.mhd.oms.domain.reservationDeliveryDetailsLink.entity.ReservationDeliveryDetailsLink; +import com.mhd.oms.domain.reservationDeliveryDetailsLink.repository.facade.IReservationDeliveryDetailsLinkService; import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail; import com.mhd.oms.domain.reservationOutMaterialDetail.entity.ReservationOutMaterialDetail; import com.mhd.oms.domain.reservationOutMaterialDetail.repository.facade.IReservationOutMaterialDetailService; @@ -64,48 +68,16 @@ public class ReservationStockOutOrderDomainService { private IReservationOutMaterialDetailService outMaterialDetailService; @Autowired private IReservationStockInOrderService reservationStockInOrderService; -// @Autowired -// private IHandoverTaskOrderService handoverTaskOrderService; -// @Autowired -// private IOutOrderAbnormalService outOrderAbnormalService; -// @Autowired -// private PickingOrderDomainService pickingOrderDomainService; -// @Autowired -// private ReplenishmentNoticeDomainService replenishmentNoticeDomainService; -// @Autowired -// private IMobilizeManageService iMobilizeManageService; -// @Autowired -// private IMobilizeManageDetailService iMobilizeManageDetailService; -// @Autowired -// private StockInOrderDomainService stockInOrderDomainService; -// @Autowired -// private IInventoryStandingDetailService inventoryStandingDetailService; -// @Autowired -// private IDeliveTaskService deliveTaskService; -// @Autowired -// private WaveOrderServiceFactory waveOrderServiceFactory; -// @Autowired -// private IMaterialBaseInfoService materialBaseInfoService; @Autowired private ReservationStockInOrderMapper reservationStockInOrderMapper; @Autowired private BusinessDocumentOrderMapper businessDocumentOrderMapper; -// @Autowired -// private IMaterialWarehouseControlService materialWarehouseControlService; -// @Autowired -// private IMaterialInventoryService materialInventoryService; @Resource private SystemServiceFeign systemServiceFeign; @Resource private WmsServiceFeign wmsServiceFeign; -// @Autowired -// private PushSyncBmsDomainService pushSyncBmsDomainService; -// @Autowired -// private MaterialBaseInfoMapper materialBaseInfoMapper; -// @Autowired -// private MaterialInventoryMapper materialInventoryMapper; -// @Autowired -// private IPickingMaterialDetailService pickingMaterialDetailService; + @Autowired + private IReservationDeliveryDetailsLinkService reservationDeliveryDetailsLinkService; /** * 分页查询出库单列表 @@ -707,4 +679,49 @@ public class ReservationStockOutOrderDomainService { return stockOutOrderService.queryOutStockNoticePrintDetail(stockOutOrderDO); } + public void returnGoods(String invoiceNumber) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + List list = reservationDeliveryDetailsLinkService.list(new QueryWrapper().lambda().eq(ReservationDeliveryDetailsLink::getInvoiceNumber, invoiceNumber)); + if (list != null && !list.isEmpty() && list.size()==1) { + ReservationDeliveryDetailsLink reservationDeliveryDetailsLink = list.get(0); + String orderNumber = reservationDeliveryDetailsLink.getOrderNumber(); + Integer bag = reservationDeliveryDetailsLink.getBag(); + ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false); + if (stockOutOrder != null) { + ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); + reservationStockInOrder.setOrganizationId(stockOutOrder.getOrganizationId()); + reservationStockInOrder.setOrganizationName(stockOutOrder.getOrganizationName()); + reservationStockInOrder.setTopOrganizationId(stockOutOrder.getTopOrganizationId()); + reservationStockInOrder.setShipperId(stockOutOrder.getShipperId()); + reservationStockInOrder.setShipperName(stockOutOrder.getShipperName()); + reservationStockInOrder.setShipperCode(stockOutOrder.getShipperCode()); + reservationStockInOrder.setBusinessOrderNo(stockOutOrder.getOutOrderNumber()); + reservationStockInOrder.setIssueStatus(0); + reservationStockInOrder.setCreateTime(new Date()); + reservationStockInOrder.setCreateBy(loginUser.getUserPo().getUserId()); + reservationStockInOrder.setCreateByName(loginUser.getUserPo().getUserName()); + reservationStockInOrder.setStatus(1); + reservationStockInOrder.setAuditStatus(1); + reservationStockInOrder.setOrderTypeName("退货入库"); + reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku"); + reservationStockInOrder.setDirectWarehouse(1); + reservationStockInOrder.setCloseOrder(2); + reservationStockInOrder.setOrderSource(1); + reservationStockInOrder.setOrderStatus("新增"); + reservationStockInOrder.setSalesmanId(loginUser.getUserPo().getUserId().toString()); + reservationStockInOrder.setSalesmanName(loginUser.getUserPo().getUserName()); + reservationStockInOrder.setInOrderNumber("退"+stockOutOrder.getOutOrderNumber()); + reservationStockInOrderMapper.insert(reservationStockInOrder); + reservationDeliveryDetailsLink.setReturnOrderNumber(reservationStockInOrder.getInOrderNumber()); + reservationDeliveryDetailsLinkService.updateById(reservationDeliveryDetailsLink); + stockOutOrder.setReturnOrderNumber(reservationStockInOrder.getInOrderNumber()); + stockOutOrder.setDeliveryName(reservationDeliveryDetailsLink.getDeliveryName()); + stockOutOrder.setInvoiceNumber(reservationDeliveryDetailsLink.getInvoiceNumber()); + stockOutOrder.setCustomerNumber(reservationDeliveryDetailsLink.getCustomerNumber()); + stockOutOrder.setReturnQuantity(new BigDecimal(bag)); + stockOutOrderService.updateById(stockOutOrder); + } + } + } + } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java index 731bafc70..b415430c5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java @@ -99,6 +99,7 @@ public class SysTableConfigServiceImpl extends ServiceImpl