From 7bc68437299f527629700d1e7aa0b69f2c3c33a4 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, 15 Apr 2026 11:25:54 +0800 Subject: [PATCH] =?UTF-8?q?wms=E5=9B=9E=E4=BC=A0oms=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=BB=93=E6=9E=9C;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rvationStockInOrderApplicationService.java | 13 +++++++ .../ReservationStockInOrderDomainService.java | 36 +++++++++++++++++++ .../ReservationStockInOrderApi.java | 11 ++++++ 3 files changed, 60 insertions(+) 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 0eaedfd15..aff5e233a 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 @@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import java.io.InputStream; import java.math.BigDecimal; @@ -253,6 +254,18 @@ public class ReservationStockInOrderApplicationService { return stockInOrderDomainService.auditState(stockInOrderDO); } + /** + * @description 下发入库单 + * @author ZhouGY + * @date 2024/5/21 13:53 + * @param + * @return Boolean + */ + public Boolean returnResult(String orderNumber, Long status, String type){ + return stockInOrderDomainService.returnResult(orderNumber, status, type); + } + + /** * @description 下发入库单 * @author ZhouGY 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 9baa4e8a9..7ee0c9234 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 @@ -23,6 +23,8 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialGoodsRul import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialWarehouseControlPO; import com.mhd.oms.domain.reservationStockInOrder.repository.po.ReservationStockInOrderPO; import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO; +import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder; +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; @@ -35,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestParam; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -55,6 +58,8 @@ public class ReservationStockInOrderDomainService { private IReservationStockInOrderService stockInOrderService; @Autowired private IReservationInMaterialDetailService materialDetailService; + @Autowired + private IReservationStockOutOrderService stockOutOrderService; // @Autowired // private ReservationStockReceiptOrderDomainService stockReceiptOrderDomainService; // @Autowired @@ -410,6 +415,37 @@ public class ReservationStockInOrderDomainService { return update; } + /** + * @description 入库单返回结果 + * @author ZhouGY + * @date 2024/5/21 13:53 + * @param orderId + * @param status + * @param type + * @return Boolean + */ + public Boolean returnResult(String orderNumber, Long status, String type) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); + if (type != null && type.equals("1")) { + return stockOutOrderService.update(null, new UpdateWrapper().lambda() + .set(ReservationStockOutOrder::getStatus, status) + .set(ReservationStockOutOrder::getUpdateBy, loginUser.getUserid()) + .set(ReservationStockOutOrder::getUpdateByName, userRealName) + .set(ReservationStockOutOrder::getUpdateTime, new Date()) + .in(ReservationStockOutOrder::getOutOrderNumber, orderNumber)); + } else { + return stockInOrderService.update(null, new UpdateWrapper().lambda() + .set(ReservationStockInOrder::getStatus, status) + .set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid()) + .set(ReservationStockInOrder::getUpdateByName, userRealName) + .set(ReservationStockInOrder::getUpdateTime, new Date()) + .in(ReservationStockInOrder::getInOrderNumber, orderNumber)); + } + } + /** * @description 取消入库单 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 66562c56d..9418364fe 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 @@ -116,6 +116,17 @@ public class ReservationStockInOrderApi extends BaseController { } + /** + * wms回传出入库结果 + */ + @ApiOperation("wms回传出入库结果") + @GetMapping(value = "/returnResult") + public AjaxResult returnResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("status") Long status, @RequestParam("type") String type) { + + return AjaxResult.success(stockInOrderApplicationService.returnResult(orderNumber, status, type)); + } + + /** * 取消入库单 */