From f50a3e690a6986a1776eee0eaca5e692cb8b68cb Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Tue, 18 Aug 2026 18:09:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(oms):=E5=87=BA=E5=BA=93=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E8=90=BD=E5=BA=93=E5=9B=9E=E5=A1=AB=E4=BB=93=E5=BA=93/?= =?UTF-8?q?=E7=BB=84=E7=BB=87/=E8=B4=A7=E4=B8=BB=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=BB=98=E8=AE=A4=E5=B7=B2=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 与入库侧同款修复:insert按仓库档案回填组织/一级组织/仓库编码名称(兜底2841)，委托方回填shipperId/customerId，status默认1已创建(配合App订单状态只读)；补fastjson import --- .../ReserveStockOutOrderDomainService.java | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) 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 508e64d9b..2c5b20546 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 @@ -42,6 +42,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSONObject; import javax.annotation.Resource; import java.math.BigDecimal; @@ -178,9 +180,39 @@ public class ReserveStockOutOrderDomainService { stockOutOrderDO.setCheckTaskDistribution(2); } LoginUser loginUser = SecurityUtils.getLoginUser(); - stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); -// stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); -// stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); + if (stockOutOrderDO.getWarehouseId() != null) { + AjaxResult wr = systemServiceFeign.getWarehouseInfoByWarehouseId(stockOutOrderDO.getWarehouseId()); + if ("200".equals(String.valueOf(wr.get("code")))) { + WarehouseFeignPO wh = JSON.parseObject(JSONObject.toJSONString(wr.get("data")), WarehouseFeignPO.class); + if (stockOutOrderDO.getOrganizationId() == null && wh.getOrganizationId() != null) { + stockOutOrderDO.setOrganizationId(wh.getOrganizationId()); + stockOutOrderDO.setOrganizationName(wh.getOrganizationName()); + } + if (wh.getTopOrganizationId() != null) { + stockOutOrderDO.setTopOrganizationId(wh.getTopOrganizationId()); + } + if (StringUtils.isBlank(stockOutOrderDO.getWarehouseCode())) { + stockOutOrderDO.setWarehouseCode(wh.getWarehouseCode()); + stockOutOrderDO.setWarehouseName(wh.getWarehouseName()); + } + } + } + if (stockOutOrderDO.getTopOrganizationId() == null) { + stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + if (stockOutOrderDO.getOrganizationId() == null) { + stockOutOrderDO.setOrganizationId(2841L); + stockOutOrderDO.setOrganizationName("仓码"); + } + if (stockOutOrderDO.getShipperId() == null && loginUser.getUserShipperPo() != null) { + stockOutOrderDO.setShipperId(loginUser.getUserPo().getUserId()); + stockOutOrderDO.setShipperName(loginUser.getUserPo().getUserName()); + stockOutOrderDO.setCustomerId(loginUser.getUserPo().getUserId()); + stockOutOrderDO.setCustomerName(loginUser.getUserPo().getUserName()); + } + if (stockOutOrderDO.getStatus() == null) { + stockOutOrderDO.setStatus(1); + } stockOutOrderService.insert(stockOutOrderDO); return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList()); }