diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index bd8852799..8fbe068b6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -620,9 +620,16 @@ public class ReservationStockInOrderDomainService { // 执行单"运输业务单号"列永远显示入库业务单号(未选运输也显示) BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime","businessOrderNo","businessNumber","tmsOrderNumber"); reservationStockInOrder.setIssueStatus(0); - reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); - reservationStockInOrder.setOrderTypeName("普通入库"); - reservationStockInOrder.setBusinessType("pu_tong_ru_ku"); + // 退货入库单下发时类型跟随预约单,避免执行入库单被固定写成普通入库 + if ("tui_huo_ru_ku".equals(byId.getOrderTypeCode()) || "退货入库".equals(byId.getOrderTypeName())) { + reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku"); + reservationStockInOrder.setOrderTypeName("退货入库"); + reservationStockInOrder.setBusinessType("tui_huo_ru_ku"); + } else { + reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); + reservationStockInOrder.setOrderTypeName("普通入库"); + reservationStockInOrder.setBusinessType("pu_tong_ru_ku"); + } reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setWarehouseId(warehouseId); if (warehouseId == null || warehouseId == 0L){ @@ -851,9 +858,16 @@ public class ReservationStockInOrderDomainService { // 运输业务单号不直接从业务单头复制,避免历史已取消运输单号残留下发到执行单 BeanUtils.copyProperties(byId, reservationStockInOrder,"inOrderId","issueStatus","issueTime","issueId","issueName","reservationAuditId","reservationAuditName","reservationAuditTime","businessOrderNo","businessNumber","tmsOrderNumber"); reservationStockInOrder.setIssueStatus(0); - reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); - reservationStockInOrder.setOrderTypeName("普通入库"); - reservationStockInOrder.setBusinessType("pu_tong_ru_ku"); + // 退货入库单下发时类型跟随预约单,避免执行入库单被固定写成普通入库 + if ("tui_huo_ru_ku".equals(byId.getOrderTypeCode()) || "退货入库".equals(byId.getOrderTypeName())) { + reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku"); + reservationStockInOrder.setOrderTypeName("退货入库"); + reservationStockInOrder.setBusinessType("tui_huo_ru_ku"); + } else { + reservationStockInOrder.setOrderTypeCode("pu_tong_ru_ku"); + reservationStockInOrder.setOrderTypeName("普通入库"); + reservationStockInOrder.setBusinessType("pu_tong_ru_ku"); + } reservationStockInOrder.setReservationOrderSource("客户预约"); reservationStockInOrder.setWarehouseId(warehouseId); // reservationStockInOrder.setOrganizationId(orgId);