From a2ebe5af258a90950b6c82c2608393c222042a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 12 May 2026 15:27:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E5=8F=91=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ReserveStockInOrderApplicationService.java | 52 +++++++++---------- .../ReserveStockInOrderDomainService.java | 13 ++++- ...eserveStockOutOrderApplicationService.java | 52 +++++++++---------- .../ReserveStockOutOrderDomainService.java | 13 ++++- .../ReserveStockInOrderMapper.xml | 3 ++ 5 files changed, 79 insertions(+), 54 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java index d8ef450ad..7777fba38 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java @@ -122,32 +122,32 @@ public class ReserveStockInOrderApplicationService { // 库管角色过滤：不展示已创建（status=1）的入库单 // 说明：部分场景下角色码可能不在 userPo.roleCode 中，而在 loginUser.roles/roleList 中。 - if (loginUser != null) { - String targetRoleCode = "KGY-001"; - boolean isKuGuan = false; - - String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; - if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { - isKuGuan = true; - } - - if (!isKuGuan && loginUser.getRoleList() != null) { - isKuGuan = loginUser.getRoleList().stream() - .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); - } - - if (!isKuGuan && loginUser.getRoles() != null) { - isKuGuan = loginUser.getRoles().stream() - .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); - } - - if (isKuGuan) { - Integer currentGtStatus = stockInOrderDO.getGtStatus(); - if (currentGtStatus == null || currentGtStatus < 1) { - stockInOrderDO.setGtStatus(1); // status > 1 - } - } - } +// if (loginUser != null) { +// String targetRoleCode = "KGY-001"; +// boolean isKuGuan = false; +// +// String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; +// if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { +// isKuGuan = true; +// } +// +// if (!isKuGuan && loginUser.getRoleList() != null) { +// isKuGuan = loginUser.getRoleList().stream() +// .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); +// } +// +// if (!isKuGuan && loginUser.getRoles() != null) { +// isKuGuan = loginUser.getRoles().stream() +// .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); +// } +// +// if (isKuGuan) { +// Integer currentGtStatus = stockInOrderDO.getGtStatus(); +// if (currentGtStatus == null || currentGtStatus < 1) { +// stockInOrderDO.setGtStatus(1); // status > 1 +// } +// } +// } return stockInOrderDomainService.queryList(stockInOrderDO); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java index 44dbd8c76..4d3071b9b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java @@ -440,7 +440,18 @@ public class ReserveStockInOrderDomainService { .set(ReserveStockInOrder::getUpdateBy, loginUser.getUserid()) .set(ReserveStockInOrder::getUpdateByName, userRealName) .set(ReserveStockInOrder::getUpdateTime, new Date()) - .in(ReserveStockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); + .set(ReserveStockInOrder::getWarehouseId, stockInOrderDO.getWarehouseId()) + .set(ReserveStockInOrder::getWarehouseCode, stockInOrderDO.getWarehouseCode()) + .set(ReserveStockInOrder::getWarehouseName, stockInOrderDO.getWarehouseName()) + .eq(ReserveStockInOrder::getInOrderId, stockInOrderDO.getInOrderId())); + + List list = materialDetailService.list(new LambdaQueryWrapper().eq(ReserveInMaterialDetail::getInOrderNumber, stockInOrderDO.getInOrderNumber())); + for (ReserveInMaterialDetail reserveInMaterialDetail : list) { + reserveInMaterialDetail.setWarehouseId(stockInOrderDO.getWarehouseId()); + reserveInMaterialDetail.setWarehouseCode(stockInOrderDO.getWarehouseCode()); + reserveInMaterialDetail.setWarehouseName(stockInOrderDO.getWarehouseName()); + materialDetailService.updateById(reserveInMaterialDetail); + } //todo下发推送到入库业务单 List inOrderIds = stockInOrderDO.getInOrderIds(); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java index 69d910b43..9e8278c16 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java @@ -130,32 +130,32 @@ public class ReserveStockOutOrderApplicationService { // 库管角色过滤：不展示已创建（status=1）的出库单 // 出库状态: 1-已创建 ... - if (loginUser != null) { - String targetRoleCode = "KGY-001"; - boolean isKuGuan = false; - - String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; - if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { - isKuGuan = true; - } - - if (!isKuGuan && loginUser.getRoleList() != null) { - isKuGuan = loginUser.getRoleList().stream() - .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); - } - - if (!isKuGuan && loginUser.getRoles() != null) { - isKuGuan = loginUser.getRoles().stream() - .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); - } - - if (isKuGuan) { - Integer currentGtStatus = stockOutOrderDO.getGtStatus(); - if (currentGtStatus == null || currentGtStatus < 1) { - stockOutOrderDO.setGtStatus(1); // status > 1 - } - } - } +// if (loginUser != null) { +// String targetRoleCode = "KGY-001"; +// boolean isKuGuan = false; +// +// String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null; +// if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) { +// isKuGuan = true; +// } +// +// if (!isKuGuan && loginUser.getRoleList() != null) { +// isKuGuan = loginUser.getRoleList().stream() +// .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); +// } +// +// if (!isKuGuan && loginUser.getRoles() != null) { +// isKuGuan = loginUser.getRoles().stream() +// .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode)); +// } +// +// if (isKuGuan) { +// Integer currentGtStatus = stockOutOrderDO.getGtStatus(); +// if (currentGtStatus == null || currentGtStatus < 1) { +// stockOutOrderDO.setGtStatus(1); // status > 1 +// } +// } +// } List stockOutOrderPOS = stockOutOrderDomainService.queryList(stockOutOrderDO); // for (ReserveStockOutOrderPO stockOutOrderPO : stockOutOrderPOS) { diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java index 1da68bce5..c842d01fe 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java @@ -1,5 +1,6 @@ package com.mhd.oms.domain.reserveStockOutOrder.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.mhd.common.core.exception.ServiceException; @@ -258,8 +259,18 @@ public class ReserveStockOutOrderDomainService { .set(ReserveStockOutOrder::getUpdateBy, loginUser.getUserid()) .set(ReserveStockOutOrder::getUpdateByName, userRealName) .set(ReserveStockOutOrder::getUpdateTime, new Date()) - .in(ReserveStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds())); + .set(ReserveStockOutOrder::getWarehouseId, stockOutOrderDO.getWarehouseId()) + .set(ReserveStockOutOrder::getWarehouseCode, stockOutOrderDO.getWarehouseCode()) + .set(ReserveStockOutOrder::getWarehouseName, stockOutOrderDO.getWarehouseName()) + .eq(ReserveStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderId())); + List list = outMaterialDetailService.list(new LambdaQueryWrapper().eq(ReserveOutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber())); + for (ReserveOutMaterialDetail reserveOutMaterialDetail : list) { + reserveOutMaterialDetail.setWarehouseId(stockOutOrderDO.getWarehouseId()); + reserveOutMaterialDetail.setWarehouseCode(stockOutOrderDO.getWarehouseCode()); + reserveOutMaterialDetail.setWarehouseName(stockOutOrderDO.getWarehouseName()); + outMaterialDetailService.updateById(reserveOutMaterialDetail); + } //todo下发推送到wms List outOrderIds = stockOutOrderDO.getOutOrderIds(); for (Long outOrderId : outOrderIds) { diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml index f90d93d64..ab9ef1728 100644 --- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml @@ -256,6 +256,9 @@ and a.warehouse_name like concat('%', #{warehouseName}, '%') + + and a.salesman_id = #{salesmanId} + and a.shipper_id = #{shipperId}