From 676c95233e3cbe119b58eab8797abcd2cfd2b7d2 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, 22 Apr 2026 18:19:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81oms=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderApplicationService.java | 4 ++-- .../service/ReservationStockInOrderDomainService.java | 8 +++----- .../ReservationStockOutOrderApplicationService.java | 4 ++-- .../service/ReservationStockOutOrderDomainService.java | 4 ++-- .../ReservationStockOutOrderApi.java | 10 ++++------ .../ReservationStockInOrderApi.java | 5 +++-- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index 36cff4dd6..5dbaeb6db 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -305,11 +305,11 @@ public class ReservationStockInOrderApplicationService { return stockInOrderDomainService.closeOrder(stockInOrderDO); } - public Boolean pushInOrder(StockInOrder stockInOrderDO){ + public Boolean pushInOrder(StockInOrderTZPD stockInOrderDO){ return stockInOrderDomainService.pushInOrder(stockInOrderDO); } - public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail){ + public Boolean pushInOrderDetail(InMaterialDetailTZPD inMaterialDetail){ return stockInOrderDomainService.pushInOrderDetail(inMaterialDetail); } 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 1891fcb5f..df7ab77b1 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 @@ -31,9 +31,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrd import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; -import com.mhd.system.api.domain.InMaterialDetail; -import com.mhd.system.api.domain.PackDetailFeignPO; -import com.mhd.system.api.domain.StockInOrder; +import com.mhd.system.api.domain.*; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; @@ -542,14 +540,14 @@ public class ReservationStockInOrderDomainService { .in(ReservationStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); } - public Boolean pushInOrder(StockInOrder stockInOrder) { + public Boolean pushInOrder(StockInOrderTZPD stockInOrder) { ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); BeanUtils.copyProperties(stockInOrder, reservationStockInOrder); reservationStockInOrder.setIssueStatus(4); return stockInOrderService.save(reservationStockInOrder); } - public Boolean pushInOrderDetail(InMaterialDetail inMaterialDetail) { + public Boolean pushInOrderDetail(InMaterialDetailTZPD inMaterialDetail) { ReservationInMaterialDetail reservationInMaterialDetail = new ReservationInMaterialDetail(); BeanUtils.copyProperties(inMaterialDetail, reservationInMaterialDetail); return materialDetailService.save(reservationInMaterialDetail); 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 ecb7da5d4..32a09aff7 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 @@ -234,11 +234,11 @@ public class ReservationStockOutOrderApplicationService { } - public Boolean pushOutOrder(StockOutOrder stockOutOrderDO){ + public Boolean pushOutOrder(StockOutOrderTZPD stockOutOrderDO){ return stockOutOrderDomainService.pushOutOrder(stockOutOrderDO); } - public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail){ + public Boolean pushOutOrderDetail(OutMaterialDetailTZPD outMaterialDetail){ return stockOutOrderDomainService.pushOutOrderDetail(outMaterialDetail); } 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 51dd5f5f8..e6820b77d 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 @@ -229,14 +229,14 @@ public class ReservationStockOutOrderDomainService { } - public Boolean pushOutOrder(StockOutOrder stockOutOrder) { + public Boolean pushOutOrder(StockOutOrderTZPD stockOutOrder) { ReservationStockOutOrder reservationStockOutOrder = new ReservationStockOutOrder(); BeanUtils.copyProperties(stockOutOrder, reservationStockOutOrder); reservationStockOutOrder.setIssueStatus(4); return stockOutOrderService.save(reservationStockOutOrder); } - public Boolean pushOutOrderDetail(OutMaterialDetail outMaterialDetail) { + public Boolean pushOutOrderDetail(OutMaterialDetailTZPD outMaterialDetail) { ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail(); BeanUtils.copyProperties(outMaterialDetail, reservationOutMaterialDetail); return outMaterialDetailService.save(reservationOutMaterialDetail); 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 7ccfdc3b8..5fbe7132d 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 @@ -14,12 +14,10 @@ import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationSt import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDTO; import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderApplicationService; import com.mhd.oms.domain.reservationStockOutOrder.service.ReservationStockOutOrderAssembler; -import com.mhd.system.api.domain.InMaterialDetail; -import com.mhd.system.api.domain.OutMaterialDetail; -import com.mhd.system.api.domain.StockInOrder; -import com.mhd.system.api.domain.StockOutOrder; +import com.mhd.system.api.domain.*; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -186,13 +184,13 @@ public class ReservationStockOutOrderApi extends BaseController { @ApiOperation("wms推送入库单") @PostMapping(value = "/pushOutOrder") - public AjaxResult pushOutOrder(@RequestBody StockOutOrder stockOutOrder) { + public AjaxResult pushOutOrder(@RequestBody StockOutOrderTZPD stockOutOrder) { return AjaxResult.success(stockOutOrderApplicationService.pushOutOrder(stockOutOrder)); } @ApiOperation("wms推送入库单明细") @PostMapping(value = "/pushOutOrderDetail") - public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetail outMaterialDetail) { + public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetailTZPD outMaterialDetail) { return AjaxResult.success(stockOutOrderApplicationService.pushOutOrderDetail(outMaterialDetail)); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java index 309a1f70e..a1693fdd5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java @@ -11,6 +11,7 @@ import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrde import com.mhd.oms.domain.reservationStockInOrder.service.ReservationStockInOrderAssembler; import com.mhd.system.api.domain.InMaterialDetail; import com.mhd.system.api.domain.StockInOrder; +import com.mhd.system.api.domain.StockInOrderTZPD; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -155,13 +156,13 @@ public class ReservationStockInOrderApi extends BaseController { @ApiOperation("wms推送入库单") @PostMapping(value = "/pushInOrder") - public AjaxResult pushInOrder(@RequestBody StockInOrder stockInOrder) { + public AjaxResult pushInOrder(@RequestBody StockInOrderTZPD stockInOrder) { return AjaxResult.success(stockInOrderApplicationService.pushInOrder(stockInOrder)); } @ApiOperation("wms推送入库单明细") @PostMapping(value = "/pushInOrderDetail") - public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetail inMaterialDetail) { + public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetailTZPD inMaterialDetail) { return AjaxResult.success(stockInOrderApplicationService.pushInOrderDetail(inMaterialDetail)); }